X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Funpack.c;h=c40c5b7cb42ecda8d20990a4d6f915bb1d10c067;hb=14a1f983de1723c52b252c161997651cecbef2e1;hp=a2cc44d9ebd2ae695a1b19c7cc3910701731189d;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/unpack.c b/Source/unpack.c
index a2cc44d..c40c5b7 100644
--- a/Source/unpack.c
+++ b/Source/unpack.c
@@ -1,8 +1,54 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+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.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #include <stdlib.h>
 
 #include "binio.h"
 #include "private.h"
-#include "unpack_private.h"
+
+struct BinIOUnpackContext
+{
+    const uint8_t *data;
+    va_list        args;
+};
+
+static void BinIOUnpack(void *context, int type, int byte_order, int count)
+{
+    struct BinIOUnpackContext *ctx = (struct BinIOUnpackContext*)context;
+    if (count == -1)
+    {
+        count = 1;
+    }
+
+    switch (type)
+    {
+        case BinIO_TYPE_IGNORE_BYTE:                                                                                                   ctx->data += 1 * count; break;
+        case BinIO_TYPE_BYTE:        BinIOConvert1(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 1 * count; break;
+        case BinIO_TYPE_INT16:       BinIOConvert2(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 2 * count; break;
+        case BinIO_TYPE_INT32:       BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break;
+        case BinIO_TYPE_INT64:       BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break;
+        case BinIO_TYPE_FLOAT32:     BinIOConvert4(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 4 * count; break;
+        case BinIO_TYPE_FLOAT64:     BinIOConvert8(byte_order, BinIO_HOST_BYTE_ORDER, ctx->data, va_arg(ctx->args, uint8_t *), count); ctx->data += 8 * count; break;
+    }
+}
 
 void unpackf(const char *format, ...)
 {
@@ -36,9 +82,11 @@ void vsunpackf(const void *buffer, const char *format, va_list args)
     BinIOInitFormatCursor(&cursor, format);
     
     context.data = (const unsigned char*)buffer;
-    context.args = args;
+    va_copy(context.args, args);
     
     while (BinIONextChar(&context, &cursor, BinIOUnpack)) {}
+
+    va_end(context.args);
 }
 
 void vfunpackf(FILE *file, const char *format, va_list args)