X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fpack.c;h=7c371f8ff83b6f8a2bdafd242d61c651e0710993;hb=92fea1660111c205fa33be8bb0e5406b301fb55e;hp=14fc023044442e044a865a50986be07aa5e9c862;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/pack.c b/Source/pack.c
index 14fc023..7c371f8 100644
--- a/Source/pack.c
+++ b/Source/pack.c
@@ -1,8 +1,105 @@
+/*
+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 "pack_private.h"
+
+struct BinIOPackContext
+{
+    uint8_t *buffer;
+    va_list  args;
+};
+
+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;
+        }
+    }
+    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;
+        }
+    }
+}
 
 extern void packf(const char *format, ...)
 {
@@ -36,9 +133,11 @@ extern void vspackf(void *buffer, const char *format, va_list args)
     BinIOInitFormatCursor(&cursor, format);
 
     context.buffer = (unsigned char *)buffer;
-    context.args = args;
-    
+    va_copy(context.args, args);
+
     while (BinIONextChar(&context, &cursor, BinIOPack)) {}
+
+    va_end(context.args);
 }
 
 extern void vfpackf(FILE *file, const char *format, va_list args)