From a883cabd1df1f440a027d1f936bbebe5a71dba36 Mon Sep 17 00:00:00 2001 From: johannes Date: Wed, 7 Feb 2024 15:47:55 +0100 Subject: changed read int to take char ** instead of unsigned char ** --- inc/pack.h | 2 +- src/demo.c | 8 ++++---- src/main.c | 4 ++-- src/pack.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/inc/pack.h b/inc/pack.h index 49e581c..0979877 100644 --- a/inc/pack.h +++ b/inc/pack.h @@ -11,7 +11,7 @@ void tobigendian(const int in, unsigned char out[4]); /* reads a teeworlds packed int from given buffer */ /* the given pointer is incremented */ -int readint(unsigned char **cp); +int readint(char **cp); /* writes given int to teeworlds packed */ /* the given pointer is incremented */ diff --git a/src/demo.c b/src/demo.c index 8452b06..a9879c0 100644 --- a/src/demo.c +++ b/src/demo.c @@ -130,8 +130,8 @@ int readdemotick(FILE *fp, char chunkhead, demotick *tick, unsigned char ver) int readdemosnap(FILE *fp, demosnap *snap, int size) { - unsigned char data[size]; - unsigned char unpacked[1024 * 8]; + char data[size]; + char unpacked[1024 * 8]; fread(data, sizeof(unsigned char), size, fp); @@ -141,7 +141,7 @@ int readdemosnap(FILE *fp, demosnap *snap, int size) return 0; } - unsigned char *cp = unpacked; + char *cp = unpacked; snap->datasize = readint(&cp); snap->numitems = readint(&cp); @@ -400,6 +400,6 @@ int writedemotick(FILE *fp, demotick *tick, unsigned char ver) int writedemosnap(FILE *fp, demosnap *snap, unsigned char ver) { - + return 1; } diff --git a/src/main.c b/src/main.c index a21c4cf..0c71919 100644 --- a/src/main.c +++ b/src/main.c @@ -131,8 +131,8 @@ void dumbtestpacker() printf("\n"); cp = buf; - int res = readint((unsigned char **)&cp); - int res2 = readint((unsigned char **)&cp); + int res = readint(&cp); + int res2 = readint(&cp); printf("res: %d\n", res); printf("res2: %d\n", res2); diff --git a/src/pack.c b/src/pack.c index 918bda9..0d23ca7 100644 --- a/src/pack.c +++ b/src/pack.c @@ -13,7 +13,7 @@ void tobigendian(const int in, unsigned char out[4]) out[3] = in & 0xff; } -int readint(unsigned char **cp) +int readint(char **cp) { int result = 0; int len = 1; -- cgit v1.2.3