github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: supress gcc warnings like libjansson

Browse source 
https://github.com/akheron/jansson/pull/423/files
This commit is contained in:
iceman1001 2019-01-09 12:28:56 +01:00
commit 96361abd97
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/jansson/Makefile
View file

@ -32,7 +32,7 @@ CMDOBJS = $(CFILES:%.c=%.o)
CLEAN = $(CMDOBJS) CLEAN = $(CMDOBJS)
CC= gcc CC= gcc
CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation
LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS) LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS)
LIBS= $(SYSLIBS) $(MYLIBS) LIBS= $(SYSLIBS) $(MYLIBS)
DEFAULT_INCLUDES = -I. DEFAULT_INCLUDES = -I.

2
client/jansson/error.c
View file

@ -25,7 +25,7 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
length = strlen(source); length = strlen(source);
if(length < JSON_ERROR_SOURCE_LENGTH) if(length < JSON_ERROR_SOURCE_LENGTH)
strncpy(error->source, source, length + 1); strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
else { else {
size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4; size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
memcpy(error->source, "...", 3); memcpy(error->source, "...", 3);

6
client/jansson/load.c
View file

@ -89,7 +89,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
{ {
va_list ap; va_list ap;
char msg_text[JSON_ERROR_TEXT_LENGTH]; char msg_text[JSON_ERROR_TEXT_LENGTH];
char msg_with_context[JSON_ERROR_TEXT_LENGTH + 20]; char msg_with_context[JSON_ERROR_TEXT_LENGTH];
int line = -1, col = -1; int line = -1, col = -1;
size_t pos = 0; size_t pos = 0;
@ -115,7 +115,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
{ {
if(lex->saved_text.length <= 20) { if(lex->saved_text.length <= 20) {
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near '%s'", msg_text, saved_text); snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near '%s'", msg_text, saved_text);
msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0'; msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
result = msg_with_context; result = msg_with_context;
} }
} }
@ -131,7 +131,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
} }
else { else {
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near end of file", msg_text); snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH, "%s near end of file", msg_text);
msg_with_context[JSON_ERROR_TEXT_LENGTH + 20 - 1] = '\0'; msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
result = msg_with_context; result = msg_with_context;
} }
} }