X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Funpack.c;h=429a2cdf5039f5ea202bdd0a45b06efbc3fe4fe2;hb=5310d6ffd89fd8b981b273b332a232b70b4ce7ad;hp=7715cc0f8f81ca279b68a5e4a67a9dee9cfdea34;hpb=44146d06c780d3aaa283672fedb08b8870ebe1b9;p=lugaru.git

diff --git a/Source/unpack.c b/Source/unpack.c
index 7715cc0..429a2cd 100644
--- a/Source/unpack.c
+++ b/Source/unpack.c
@@ -10,7 +10,7 @@ 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.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -23,7 +23,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #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, ...)
 {
@@ -55,10 +97,10 @@ void vsunpackf(const void *buffer, const char *format, va_list args)
     struct BinIOUnpackContext context;
 
     BinIOInitFormatCursor(&cursor, format);
-    
+
     context.data = (const unsigned char*)buffer;
     va_copy(context.args, args);
-    
+
     while (BinIONextChar(&context, &cursor, BinIOUnpack)) {}
 
     va_end(context.args);
@@ -69,8 +111,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);
 }