LineageOS/android_external_json-c
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate use of MC_ABORT in json-c code, and mark MC_ABORT/mc_abort deprecated.

Browse Source 
Also adjust an error message in json_util to make it unique.  Fixes #87.
This commit is contained in:
Eric Haszlakiewicz
2013-06-29 15:31:18 -05:00
parent be002fbb96
commit b3bce4d594
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debug.h
View File

@@ -23,6 +23,10 @@ extern void mc_set_debug(int debug);
extern int mc_get_debug(void); extern int mc_get_debug(void);
extern void mc_set_syslog(int syslog); extern void mc_set_syslog(int syslog);
/**
* @deprecated Use mc_error(), and return an appropriate error.
*/
extern void mc_abort(const char *msg, ...); extern void mc_abort(const char *msg, ...);
extern void mc_debug(const char *msg, ...); extern void mc_debug(const char *msg, ...);
extern void mc_error(const char *msg, ...); extern void mc_error(const char *msg, ...);
@@ -48,6 +52,9 @@ extern void mc_info(const char *msg, ...);
#endif #endif
/**
* @deprecated Use MC_ERROR(), and return an appropriate error.
*/
#define MC_ABORT(x, ...) mc_abort(x, ##__VA_ARGS__) #define MC_ABORT(x, ...) mc_abort(x, ##__VA_ARGS__)
#define MC_ERROR(x, ...) mc_error(x, ##__VA_ARGS__) #define MC_ERROR(x, ...) mc_error(x, ##__VA_ARGS__)

4
json_util.c
View File

@@ -73,7 +73,7 @@ struct json_object* json_object_from_file(const char *filename)
int fd, ret; int fd, ret;
if((fd = open(filename, O_RDONLY)) < 0) { if((fd = open(filename, O_RDONLY)) < 0) {
MC_ERROR("json_object_from_file: error reading file %s: %s\n", MC_ERROR("json_object_from_file: error opening file %s: %s\n",
filename, strerror(errno)); filename, strerror(errno));
return NULL; return NULL;
} }
@@ -87,7 +87,7 @@ struct json_object* json_object_from_file(const char *filename)
} }
close(fd); close(fd);
if(ret < 0) { if(ret < 0) {
MC_ABORT("json_object_from_file: error reading file %s: %s\n", MC_ERROR("json_object_from_file: error reading file %s: %s\n",
filename, strerror(errno)); filename, strerror(errno));
printbuf_free(pb); printbuf_free(pb);
return NULL; return NULL;