X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fpack.c;h=736085d396a125c4379869b03221849a8a6f2767;hb=5509b55dbc13227bdc7b97f2934fa71dad02cc66;hp=7c371f8ff83b6f8a2bdafd242d61c651e0710993;hpb=92fea1660111c205fa33be8bb0e5406b301fb55e;p=lugaru.git
diff --git a/Source/pack.c b/Source/pack.c
index 7c371f8..736085d 100644
--- a/Source/pack.c
+++ b/Source/pack.c
@@ -1,22 +1,21 @@
/*
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 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.
-This program is distributed in the hope that it will be useful,
+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.
+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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+along with Lugaru. If not, see .
*/
#include
@@ -24,8 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "binio.h"
#include "private.h"
-struct BinIOPackContext
-{
+struct BinIOPackContext {
uint8_t *buffer;
va_list args;
};
@@ -33,70 +31,78 @@ struct BinIOPackContext
static void BinIOPack(void *context, int type, int byte_order, int count)
{
struct BinIOPackContext *ctx = (struct BinIOPackContext*)context;
- if (count == -1)
- {
- switch (type)
- {
- case BinIO_TYPE_IGNORE_BYTE:
- {
- ctx->buffer += 1;
- }
- break;
- case BinIO_TYPE_BYTE:
- {
- uint8_t value = va_arg(ctx->args, int);
- BinIOConvert1(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 1;
- }
- break;
- case BinIO_TYPE_INT16:
- {
- uint16_t value = va_arg(ctx->args, int);
- BinIOConvert2(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 2;
- }
- break;
- case BinIO_TYPE_INT32:
- {
- int value = va_arg(ctx->args, int);
- BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 4;
- }
- break;
- case BinIO_TYPE_INT64:
- {
- uint64_t value = va_arg(ctx->args, uint64_t);
- BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 8;
- }
- break;
- case BinIO_TYPE_FLOAT32:
- {
- float32_t value = (float32_t)va_arg(ctx->args, double);
- BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 4;
- }
- break;
- case BinIO_TYPE_FLOAT64:
- {
- float64_t value = va_arg(ctx->args, float64_t);
- BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
- ctx->buffer += 8;
- }
- break;
+ if (count == -1) {
+ switch (type) {
+ case BinIO_TYPE_IGNORE_BYTE: {
+ ctx->buffer += 1;
}
- }
- else
- {
- switch (type)
- {
- case BinIO_TYPE_IGNORE_BYTE: ctx->buffer += 1 * count; break;
- case BinIO_TYPE_BYTE: BinIOConvert1(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 1 * count; break;
- case BinIO_TYPE_INT16: BinIOConvert2(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 2 * count; break;
- case BinIO_TYPE_INT32: BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 4 * count; break;
- case BinIO_TYPE_INT64: BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 8 * count; break;
- case BinIO_TYPE_FLOAT32: BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 4 * count; break;
- case BinIO_TYPE_FLOAT64: BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count); ctx->buffer += 8 * count; break;
+ break;
+ case BinIO_TYPE_BYTE: {
+ uint8_t value = va_arg(ctx->args, int);
+ BinIOConvert1(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 1;
+ }
+ break;
+ case BinIO_TYPE_INT16: {
+ uint16_t value = va_arg(ctx->args, int);
+ BinIOConvert2(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 2;
+ }
+ break;
+ case BinIO_TYPE_INT32: {
+ int value = va_arg(ctx->args, int);
+ BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 4;
+ }
+ break;
+ case BinIO_TYPE_INT64: {
+ uint64_t value = va_arg(ctx->args, uint64_t);
+ BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 8;
+ }
+ break;
+ case BinIO_TYPE_FLOAT32: {
+ float32_t value = (float32_t)va_arg(ctx->args, double);
+ BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 4;
+ }
+ break;
+ case BinIO_TYPE_FLOAT64: {
+ float64_t value = va_arg(ctx->args, float64_t);
+ BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, (const uint8_t *)&value, ctx->buffer, 1);
+ ctx->buffer += 8;
+ }
+ break;
+ }
+ } else {
+ switch (type) {
+ case BinIO_TYPE_IGNORE_BYTE:
+ ctx->buffer += 1 * count;
+ break;
+ case BinIO_TYPE_BYTE:
+ BinIOConvert1(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 1 * count;
+ break;
+ case BinIO_TYPE_INT16:
+ BinIOConvert2(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 2 * count;
+ break;
+ case BinIO_TYPE_INT32:
+ BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 4 * count;
+ break;
+ case BinIO_TYPE_INT64:
+ BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 8 * count;
+ break;
+ case BinIO_TYPE_FLOAT32:
+ BinIOConvert4(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 4 * count;
+ break;
+ case BinIO_TYPE_FLOAT64:
+ BinIOConvert8(BinIO_HOST_BYTE_ORDER, byte_order, va_arg(ctx->args, uint8_t *), ctx->buffer, count);
+ ctx->buffer += 8 * count;
+ break;
}
}
}
@@ -144,9 +150,9 @@ extern void vfpackf(FILE *file, const char *format, va_list args)
{
size_t n_bytes = BinIOFormatByteCount(format);
void* buffer = malloc(n_bytes);
-
+
vspackf(buffer, format, args);
-
+
fwrite(buffer, n_bytes, 1, file);
free(buffer);
}