From 92fea1660111c205fa33be8bb0e5406b301fb55e Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Sat, 18 Dec 2010 16:05:13 +0300 Subject: [PATCH] Slightly squash pack stuff --- CMakeLists.txt | 2 - Source/pack.c | 78 +++++++++++++++++++++++++++++++++++- Source/pack_private.c | 93 ------------------------------------------- Source/pack_private.h | 36 ----------------- 4 files changed, 77 insertions(+), 132 deletions(-) delete mode 100644 Source/pack_private.c delete mode 100644 Source/pack_private.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 632dc73..6ea4e85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ set(LUGARU_SRCS ${SRCDIR}/Models.cpp ${SRCDIR}/Objects.cpp ${SRCDIR}/pack.c - ${SRCDIR}/pack_private.c ${SRCDIR}/Person.cpp ${SRCDIR}/private.c ${SRCDIR}/Quaternions.cpp @@ -108,7 +107,6 @@ set(LUGARU_H ${SRCDIR}/openal_wrapper.h ${SRCDIR}/gamegl.h ${SRCDIR}/glstubs.h - ${SRCDIR}/pack_private.h ${SRCDIR}/private.h ${SRCDIR}/Settings.h ${SRCDIR}/Stereo.h diff --git a/Source/pack.c b/Source/pack.c index e410ab4..7c371f8 100644 --- a/Source/pack.c +++ b/Source/pack.c @@ -23,7 +23,83 @@ 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, ...) { diff --git a/Source/pack_private.c b/Source/pack_private.c deleted file mode 100644 index a501751..0000000 --- a/Source/pack_private.c +++ /dev/null @@ -1,93 +0,0 @@ -/* -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 "pack_private.h" - -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; - } - } -} diff --git a/Source/pack_private.h b/Source/pack_private.h deleted file mode 100644 index 2a96dbb..0000000 --- a/Source/pack_private.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -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. -*/ - -#ifndef pack_private_h -#define pack_private_h - -#include "private.h" - -struct BinIOPackContext -{ - uint8_t *buffer; - va_list args; -}; - -extern void BinIOPack(void *context, int type, int byte_order, int count); - -#endif - -- 2.39.2