X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fpack.c;h=f26b2e2b0abc0bff0f95ee70db6aa4a1e0b7bc6d;hb=e9b773733850c91db5ab24c52dc2cfc57caf51e0;hp=e410ab438f9fe3c42538f2dfa894d810801c4977;hpb=44146d06c780d3aaa283672fedb08b8870ebe1b9;p=lugaru.git

diff --git a/Source/pack.c b/Source/pack.c
index e410ab4..f26b2e2 100644
--- a/Source/pack.c
+++ b/Source/pack.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,90 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #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, ...)
 {
@@ -68,9 +151,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);
 }