mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-01-18 22:20:45 +08:00
remove a warning
This commit is contained in:
parent
8512c0ea09
commit
01cf818e48
1 changed files with 7 additions and 9 deletions
|
@ -3,8 +3,7 @@
|
|||
|
||||
void jsonp_error_init(json_error_t *error, const char *source)
|
||||
{
|
||||
if(error)
|
||||
{
|
||||
if (error) {
|
||||
error->text[0] = '\0';
|
||||
error->line = -1;
|
||||
error->column = -1;
|
||||
|
@ -20,13 +19,13 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
|
|||
{
|
||||
size_t length;
|
||||
|
||||
if(!error || !source)
|
||||
if (!error || !source)
|
||||
return;
|
||||
|
||||
length = strlen(source);
|
||||
if(length < JSON_ERROR_SOURCE_LENGTH)
|
||||
strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
|
||||
else {
|
||||
if (length < JSON_ERROR_SOURCE_LENGTH) {
|
||||
strncpy(error->source, source, length);
|
||||
} else {
|
||||
size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
|
||||
memcpy(error->source, "...", 3);
|
||||
strncpy(error->source + 3, source + extra, length - extra + 1);
|
||||
|
@ -38,7 +37,6 @@ void jsonp_error_set(json_error_t *error, int line, int column,
|
|||
const char *msg, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, msg);
|
||||
jsonp_error_vset(error, line, column, position, code, msg, ap);
|
||||
va_end(ap);
|
||||
|
@ -48,10 +46,10 @@ void jsonp_error_vset(json_error_t *error, int line, int column,
|
|||
size_t position, enum json_error_code code,
|
||||
const char *msg, va_list ap)
|
||||
{
|
||||
if(!error)
|
||||
if (!error)
|
||||
return;
|
||||
|
||||
if(error->text[0] != '\0') {
|
||||
if (error->text[0] != '\0') {
|
||||
/* error already set */
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue