From b3bce4d5943774b59d7fa653da89f48db70d013e Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sat, 29 Jun 2013 15:31:18 -0500 Subject: [PATCH] Eliminate use of MC_ABORT in json-c code, and mark MC_ABORT/mc_abort deprecated. Also adjust an error message in json_util to make it unique. Fixes #87. --- debug.h | 7 +++++++ json_util.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debug.h b/debug.h index 1e097017..f2dc5411 100644 --- a/debug.h +++ b/debug.h @@ -23,6 +23,10 @@ extern void mc_set_debug(int debug); extern int mc_get_debug(void); 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_debug(const char *msg, ...); extern void mc_error(const char *msg, ...); @@ -48,6 +52,9 @@ extern void mc_info(const char *msg, ...); #endif +/** + * @deprecated Use MC_ERROR(), and return an appropriate error. + */ #define MC_ABORT(x, ...) mc_abort(x, ##__VA_ARGS__) #define MC_ERROR(x, ...) mc_error(x, ##__VA_ARGS__) diff --git a/json_util.c b/json_util.c index d62d54e4..cab2f1ec 100644 --- a/json_util.c +++ b/json_util.c @@ -73,7 +73,7 @@ struct json_object* json_object_from_file(const char *filename) int fd, ret; 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)); return NULL; } @@ -87,7 +87,7 @@ struct json_object* json_object_from_file(const char *filename) } close(fd); 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)); printbuf_free(pb); return NULL; -- 2.39.5