X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fprivate.c;h=6ff2b59ca18e7356cfac23d8e42bdb926e63361a;hb=1991e81a5c3bcc9cd0d6d49f56ebd8bcbd76e7b4;hp=e50c68a9242dfb5775e83adce640de75b6f7c21a;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git
diff --git a/Source/private.c b/Source/private.c
index e50c68a..6ff2b59 100644
--- a/Source/private.c
+++ b/Source/private.c
@@ -1,3 +1,23 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+Lugaru is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Lugaru. If not, see .
+*/
+
#include
#include "private.h"
@@ -7,18 +27,14 @@ void BinIOConvert1(int from_byte_order, int to_byte_order,
unsigned int count)
{
if (BinIONormalizeByteOrder(from_byte_order) !=
- BinIONormalizeByteOrder(to_byte_order))
- {
+ BinIONormalizeByteOrder(to_byte_order)) {
unsigned int i;
- for (i = 0; i < count; ++i)
- {
+ for (i = 0; i < count; ++i) {
BinIOSwap1(src, dst);
src += 1;
dst += 1;
}
- }
- else
- {
+ } else {
memcpy(dst, src, 1 * count);
}
}
@@ -28,18 +44,14 @@ void BinIOConvert2(int from_byte_order, int to_byte_order,
unsigned int count)
{
if (BinIONormalizeByteOrder(from_byte_order) !=
- BinIONormalizeByteOrder(to_byte_order))
- {
+ BinIONormalizeByteOrder(to_byte_order)) {
unsigned int i;
- for (i = 0; i < count; ++i)
- {
+ for (i = 0; i < count; ++i) {
BinIOSwap2(src, dst);
src += 2;
dst += 2;
}
- }
- else
- {
+ } else {
memcpy(dst, src, 2 * count);
}
}
@@ -49,18 +61,14 @@ void BinIOConvert4(int from_byte_order, int to_byte_order,
unsigned int count)
{
if (BinIONormalizeByteOrder(from_byte_order) !=
- BinIONormalizeByteOrder(to_byte_order))
- {
+ BinIONormalizeByteOrder(to_byte_order)) {
unsigned int i;
- for (i = 0; i < count; ++i)
- {
+ for (i = 0; i < count; ++i) {
BinIOSwap4(src, dst);
src += 4;
dst += 4;
}
- }
- else
- {
+ } else {
memcpy(dst, src, 4 * count);
}
}
@@ -70,18 +78,14 @@ void BinIOConvert8(int from_byte_order, int to_byte_order,
unsigned int count)
{
if (BinIONormalizeByteOrder(from_byte_order) !=
- BinIONormalizeByteOrder(to_byte_order))
- {
+ BinIONormalizeByteOrder(to_byte_order)) {
unsigned int i;
- for (i = 0; i < count; ++i)
- {
+ for (i = 0; i < count; ++i) {
BinIOSwap8(src, dst);
src += 8;
dst += 8;
}
- }
- else
- {
+ } else {
memcpy(dst, src, 8 * count);
}
}
@@ -100,71 +104,90 @@ int BinIONextChar(void *context,
{
int count, value;
int c;
- switch (c = *(cursor->cursor)++)
- {
- case BinIO_LITTLE_ENDIAN_BYTE_ORDER:
- case BinIO_BIG_ENDIAN_BYTE_ORDER:
- case BinIO_HOST_BYTE_ORDER:
- case BinIO_NETWORK_BYTE_ORDER:
- cursor->byte_order = c;
- break;
-
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- count = cursor->count;
- value = c - '0';
- if (count == -1)
- {
- cursor->count = value;
- }
- else
- {
- cursor->count = (count * 10) + value;
- }
- break;
-
- case BinIO_TYPE_IGNORE_BYTE:
- case BinIO_TYPE_BYTE:
- case BinIO_TYPE_INT16:
- case BinIO_TYPE_INT32:
- case BinIO_TYPE_INT64:
- case BinIO_TYPE_FLOAT32:
- case BinIO_TYPE_FLOAT64:
- func(context, c, cursor->byte_order, cursor->count);
- cursor->byte_order = BinIO_HOST_BYTE_ORDER;
- cursor->count = -1;
- break;
-
- case ' ': case '\t': case '\r': case '\n':
- break;
-
- default:
- return 0;
+ switch (c = *(cursor->cursor)++) {
+ case BinIO_LITTLE_ENDIAN_BYTE_ORDER:
+ case BinIO_BIG_ENDIAN_BYTE_ORDER:
+ case BinIO_HOST_BYTE_ORDER:
+ case BinIO_NETWORK_BYTE_ORDER:
+ cursor->byte_order = c;
+ break;
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ count = cursor->count;
+ value = c - '0';
+ if (count == -1) {
+ cursor->count = value;
+ } else {
+ cursor->count = (count * 10) + value;
+ }
+ break;
+
+ case BinIO_TYPE_IGNORE_BYTE:
+ case BinIO_TYPE_BYTE:
+ case BinIO_TYPE_INT16:
+ case BinIO_TYPE_INT32:
+ case BinIO_TYPE_INT64:
+ case BinIO_TYPE_FLOAT32:
+ case BinIO_TYPE_FLOAT64:
+ func(context, c, cursor->byte_order, cursor->count);
+ cursor->byte_order = BinIO_HOST_BYTE_ORDER;
+ cursor->count = -1;
+ break;
+
+ case ' ':
+ case '\t':
+ case '\r':
+ case '\n':
+ break;
+
+ default:
+ return 0;
}
-
+
return 1;
}
extern void BinIOCountBytes(void *context, int type, int byte_order, int count)
{
size_t type_size = 0;
-
- if (count == -1)
- {
+
+ if (count == -1) {
count = 1;
}
-
- switch (type)
- {
- case BinIO_TYPE_IGNORE_BYTE: type_size = 1; break;
- case BinIO_TYPE_BYTE: type_size = 1; break;
- case BinIO_TYPE_INT16: type_size = 2; break;
- case BinIO_TYPE_INT32: type_size = 4; break;
- case BinIO_TYPE_INT64: type_size = 8; break;
- case BinIO_TYPE_FLOAT32: type_size = 4; break;
- case BinIO_TYPE_FLOAT64: type_size = 8; break;
+
+ switch (type) {
+ case BinIO_TYPE_IGNORE_BYTE:
+ type_size = 1;
+ break;
+ case BinIO_TYPE_BYTE:
+ type_size = 1;
+ break;
+ case BinIO_TYPE_INT16:
+ type_size = 2;
+ break;
+ case BinIO_TYPE_INT32:
+ type_size = 4;
+ break;
+ case BinIO_TYPE_INT64:
+ type_size = 8;
+ break;
+ case BinIO_TYPE_FLOAT32:
+ type_size = 4;
+ break;
+ case BinIO_TYPE_FLOAT64:
+ type_size = 8;
+ break;
}
-
+
*(size_t*)context += type_size * count;
}
@@ -174,8 +197,8 @@ extern size_t BinIOFormatByteCount(const char *format)
size_t n_bytes = 0;
BinIOInitFormatCursor(&cursor, format);
-
+
while (BinIONextChar(&n_bytes, &cursor, BinIOCountBytes)) {}
-
+
return n_bytes;
}