zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings in sjson

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7813 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-07-19 09:49:15 +00:00 committed by Christoph Oelckers
parent 0cd74a6782
commit e49e8f4cd6
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/build/include/sjson.h
View file

@ -324,9 +324,9 @@ bool sjson_check(const sjson_node* node, char errmsg[256]);
#ifndef sjson_malloc #ifndef sjson_malloc
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
# define sjson_malloc(user, size) malloc(size) # define sjson_malloc(user, size) (UNREFERENCED_PARAMETER(user), malloc(size))
# define sjson_free(user, ptr) free(ptr) # define sjson_free(user, ptr) (UNREFERENCED_PARAMETER(user), free(ptr))
# define sjson_realloc(user, ptr, size) realloc(ptr, size) # define sjson_realloc(user, ptr, size) (UNREFERENCED_PARAMETER(user), realloc(ptr, size))
#endif #endif
#ifndef sjson_assert #ifndef sjson_assert
@ -453,6 +453,8 @@ static inline void sjson__sb_grow(sjson_context* ctx, sjson__sb* sb, int need)
} }
sb->cur = sb->start + length; sb->cur = sb->start + length;
sb->end = sb->start + alloc - 1; sb->end = sb->start + alloc - 1;
UNREFERENCED_PARAMETER(ctx);
} }
static inline void sjson__sb_put(sjson_context* ctx, sjson__sb* sb, const char *bytes, int count) static inline void sjson__sb_put(sjson_context* ctx, sjson__sb* sb, const char *bytes, int count)
@ -476,7 +478,7 @@ static inline void sjson__sb_puts(sjson_context* ctx, sjson__sb* sb, const char
static inline char* sjson__sb_finish(sjson__sb* sb) static inline char* sjson__sb_finish(sjson__sb* sb)
{ {
*sb->cur = 0; *sb->cur = 0;
sjson_assert(sb->start <= sb->cur && sjson_strlen(sb->start) == (int)(intptr_t)(sb->cur - sb->start)); sjson_assert(sb->start <= sb->cur && sjson_strlen(sb->start) == (size_t)(sb->cur - sb->start));
return sb->start; return sb->start;
} }
@ -2314,8 +2316,10 @@ bool sjson_check(const sjson_node* node, char errmsg[256])
problem("tag is invalid (%u)", node->tag); problem("tag is invalid (%u)", node->tag);
if (node->tag == SJSON_BOOL) { if (node->tag == SJSON_BOOL) {
#if 0
if (node->bool_ != false && node->bool_ != true) if (node->bool_ != false && node->bool_ != true)
problem("bool_ is neither false (%d) nor true (%d)", (int)false, (int)true); problem("bool_ is neither false (%d) nor true (%d)", (int)false, (int)true);
#endif
} else if (node->tag == SJSON_STRING) { } else if (node->tag == SJSON_STRING) {
if (node->string_ == NULL) if (node->string_ == NULL)
problem("string_ is NULL"); problem("string_ is NULL");