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

diff --git a/Source/unpack.c b/Source/unpack.c
index a2cc44d..fbcce38 100644
--- a/Source/unpack.c
+++ b/Source/unpack.c
@@ -1,8 +1,70 @@
+/*
+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 <http://www.gnu.org/licenses/>.
+*/
+
 #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, ...)
 {
@@ -34,11 +96,13 @@ void vsunpackf(const void *buffer, const char *format, va_list args)
     struct BinIOUnpackContext context;
 
     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)
@@ -46,8 +110,8 @@ void vfunpackf(FILE *file, const char *format, va_list args)
     size_t n_bytes = BinIOFormatByteCount(format);
     void* buffer = malloc(n_bytes);
     fread(buffer, n_bytes, 1, file);
-    
+
     vsunpackf(buffer, format, args);
-    
+
     free(buffer);
 }