Rewrite the Makefile to have proper dependencies and stuff

[gldbg.git] / source / gldecoder.c

diff --git a/source/gldecoder.c b/source/gldecoder.c
index e11d13c46d51ef0a064415eecf7933b7cb0e6b10..f61e327aa92a9217a589ebb8f7174680f8125a7c 100644 (file)
--- a/source/gldecoder.c
+++ b/source/gldecoder.c
@@ -9,10 +9,12 @@ Distributed under the GPL
 #include <string.h>
 #include "functions.h"
 #include "gldecoder.h"
+#include "tmpalloc.h"
 
 static unsigned read_short(short *, const char *);
 static unsigned read_int(int *, const char *);
-static int decode_func(GlDecoder *, short, const char *);
+static int decode_func(GlDecoder *, unsigned short, const char *);
+static int decode_gldfunc(GlDecoder *, unsigned short, const char *);
 
 GlDecoder *gldecoder_new(void *user_data, void (*destroy)(void *))
 {
@@ -36,19 +38,22 @@ void gldecoder_delete(GlDecoder *dec)
 int gldecoder_decode(GlDecoder *dec, const char *data, unsigned len)
 {
        unsigned pos = 0;
-       int pktlen;
-       short func;
+       unsigned pktlen;
+       unsigned short func;
        int ret;
 
        if(len<sizeof(int)+sizeof(short))
                return -1;
-       pos += read_int(&pktlen, data);
+       pos += read_int((int *)&pktlen, data);
        if(len<pktlen)
                return -1;
-       pos += read_short(&func, data+pos);
+       pos += read_short((short *)&func, data+pos);
        if(dec)
        {
-               ret = decode_func(dec, func, data+pos);
+               if(func&0x8000)
+                       ret = decode_gldfunc(dec, func, data+pos);
+               else
+                       ret = decode_func(dec, func, data+pos);
                if(ret<0)
                        return -1;
        }
@@ -79,13 +84,7 @@ static unsigned read_long(long *v, const char *data)
        return sizeof(long);
 }
 
-static unsigned read_ulong(unsigned long *v, const char *data)
-{
-       *v = *(unsigned long *)data;
-       return sizeof(unsigned long);
-}
-
-static unsigned read_longlong(long long *v, const char *data)
+static unsigned read_long_long(long long *v, const char *data)
 {
        *v = *(long long *)data;
        return sizeof(long long);
@@ -103,7 +102,9 @@ static unsigned read_double(double *v, const char *data)
        return sizeof(double);
 }
 
-static unsigned read_pointer(void **v, const char *data)
+typedef void *pointer;
+
+static unsigned read_pointer(pointer *v, const char *data)
 {
        *v = *(void **)data;
        return sizeof(void *);
@@ -121,9 +122,42 @@ static unsigned read_data(const void **v, const char *data)
        return pos+vlen;
 }
 
-static unsigned read_string(const unsigned char **v, const char *data)
+typedef const char *string;
+
+static unsigned read_string(string *v, const char *data)
 {
        return read_data((const void **)v, data);
 }
 
-#include "gldecoder.funcs"
+static unsigned read_string_array(string **v, const char *data)
+{
+       int count;
+       unsigned pos = 0;
+       int i;
+       pos += read_int(&count, data);
+       *v = (string *)tmpalloc(count*sizeof(string));
+       for(i=0; i<count; ++i)
+               pos += read_string(*v+i, data+pos);
+       return pos;
+}
+
+#include "gensrc/gldecoder.funcs"
+
+static int decode_gldError(GlDecoder *dec, const char *data)
+{
+       unsigned pos = 0;
+       GLenum code;
+       pos += read_int((int *)&code, data);
+       if(dec->gldError)
+               dec->gldError(dec->user_data, code);
+       return pos;
+}
+
+static int decode_gldfunc(GlDecoder *dec, unsigned short func, const char *data)
+{
+       switch(func)
+       {
+       case FUNC_GLDERROR: return decode_gldError(dec, data);
+       default: return -1;
+       }
+}