github-code/json-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #771/#768 by marking usage() as "noreturn" instead of using "FALLTHRU" in the case statement where it'd called.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2022-06-13 01:02:53 +00:00
parent 11546bfd07
commit 6ee0a35a20
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/json_parse.c
View File

@@ -22,6 +22,19 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifndef JSON_NORETURN
#if defined(_MSC_VER)
#define JSON_NORETURN __declspec(noreturn)
#elif defined(__OS400__)
#define JSON_NORETURN
#else
/* 'cold' attribute is for optimization, telling the computer this code
* path is unlikely.
*/
#define JSON_NORETURN __attribute__((noreturn, cold))
#endif
#endif
static int formatted_output = 0; static int formatted_output = 0;
static int show_output = 1; static int show_output = 1;
static int strict_mode = 0; static int strict_mode = 0;
@@ -31,7 +44,7 @@ static const char *fname = NULL;
#define json_tokener_get_parse_end(tok) ((tok)->char_offset) #define json_tokener_get_parse_end(tok) ((tok)->char_offset)
#endif #endif
static void usage(const char *argv0, int exitval, const char *errmsg); JSON_NORETURN static void usage(const char *argv0, int exitval, const char *errmsg);
static void showmem(void); static void showmem(void);
static int parseit(int fd, int (*callback)(struct json_object *)); static int parseit(int fd, int (*callback)(struct json_object *));
static int showobj(struct json_object *new_obj); static int showobj(struct json_object *new_obj);
@@ -167,7 +180,7 @@ int main(int argc, char **argv)
case 'f': formatted_output = 1; break; case 'f': formatted_output = 1; break;
case 'n': show_output = 0; break; case 'n': show_output = 0; break;
case 's': strict_mode = 1; break; case 's': strict_mode = 1; break;
case 'h': usage(argv[0], 0, NULL); /* FALLTHRU */ case 'h': usage(argv[0], 0, NULL);
default: /* '?' */ usage(argv[0], EXIT_FAILURE, "Unknown arguments"); default: /* '?' */ usage(argv[0], EXIT_FAILURE, "Unknown arguments");
} }
} }