Patch allows for json-c compile with -Werror and not fail due to
-Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations Geoffrey Young, geoff at modperlcookbook dot org git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@20 327403b1-1117-474d-bef2-5cb71233fd97
This commit is contained in:
@@ -4,6 +4,9 @@
|
|||||||
* Fix bug with use of capital E in numbers with exponents
|
* Fix bug with use of capital E in numbers with exponents
|
||||||
Mateusz Loskot, mateusz at loskot dot net
|
Mateusz Loskot, mateusz at loskot dot net
|
||||||
* Add stddef.h include
|
* Add stddef.h include
|
||||||
|
* Patch allows for json-c compile with -Werror and not fail due to
|
||||||
|
-Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
|
||||||
|
Geoffrey Young, geoff at modperlcookbook dot org
|
||||||
|
|
||||||
0.7
|
0.7
|
||||||
* Add escaping of backslash to json output
|
* Add escaping of backslash to json output
|
||||||
|
|||||||
2
debug.h
2
debug.h
@@ -13,7 +13,7 @@
|
|||||||
#define _DEBUG_H_
|
#define _DEBUG_H_
|
||||||
|
|
||||||
extern void mc_set_debug(int debug);
|
extern void mc_set_debug(int debug);
|
||||||
extern int mc_get_debug();
|
extern int mc_get_debug(void);
|
||||||
|
|
||||||
extern void mc_set_syslog(int syslog);
|
extern void mc_set_syslog(int syslog);
|
||||||
extern void mc_abort(const char *msg, ...);
|
extern void mc_abort(const char *msg, ...);
|
||||||
|
|||||||
@@ -55,14 +55,14 @@ static struct json_object* json_object_new(enum json_type o_type);
|
|||||||
|
|
||||||
static struct lh_table *json_object_table;
|
static struct lh_table *json_object_table;
|
||||||
|
|
||||||
static void json_object_init() __attribute__ ((constructor));
|
static void json_object_init(void) __attribute__ ((constructor));
|
||||||
static void json_object_init() {
|
static void json_object_init(void) {
|
||||||
MC_DEBUG("json_object_init: creating object table\n");
|
MC_DEBUG("json_object_init: creating object table\n");
|
||||||
json_object_table = lh_kptr_table_new(128, "json_object_table", NULL);
|
json_object_table = lh_kptr_table_new(128, "json_object_table", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void json_object_fini() __attribute__ ((destructor));
|
static void json_object_fini(void) __attribute__ ((destructor));
|
||||||
static void json_object_fini() {
|
static void json_object_fini(void) {
|
||||||
struct lh_entry *ent;
|
struct lh_entry *ent;
|
||||||
if(MC_GET_DEBUG()) {
|
if(MC_GET_DEBUG()) {
|
||||||
if (json_object_table->count) {
|
if (json_object_table->count) {
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ extern char* json_object_to_json_string(struct json_object *obj);
|
|||||||
/** Create a new empty object
|
/** Create a new empty object
|
||||||
* @returns a json_object of type json_type_object
|
* @returns a json_object of type json_type_object
|
||||||
*/
|
*/
|
||||||
extern struct json_object* json_object_new_object();
|
extern struct json_object* json_object_new_object(void);
|
||||||
|
|
||||||
/** Get the hashtable of a json_object of type json_type_object
|
/** Get the hashtable of a json_object of type json_type_object
|
||||||
* @param obj the json_object instance
|
* @param obj the json_object instance
|
||||||
@@ -167,7 +167,7 @@ extern void json_object_object_del(struct json_object* obj, char *key);
|
|||||||
/** Create a new empty json_object of type json_type_array
|
/** Create a new empty json_object of type json_type_array
|
||||||
* @returns a json_object of type json_type_array
|
* @returns a json_object of type json_type_array
|
||||||
*/
|
*/
|
||||||
extern struct json_object* json_object_new_array();
|
extern struct json_object* json_object_new_array(void);
|
||||||
|
|
||||||
/** Get the arraylist of a json_object of type json_type_array
|
/** Get the arraylist of a json_object of type json_type_array
|
||||||
* @param obj the json_object instance
|
* @param obj the json_object instance
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ struct json_tokener
|
|||||||
|
|
||||||
extern const char* json_tokener_errors[];
|
extern const char* json_tokener_errors[];
|
||||||
|
|
||||||
extern struct json_tokener* json_tokener_new();
|
extern struct json_tokener* json_tokener_new(void);
|
||||||
extern void json_tokener_free(struct json_tokener *tok);
|
extern void json_tokener_free(struct json_tokener *tok);
|
||||||
extern void json_tokener_reset(struct json_tokener *tok);
|
extern void json_tokener_reset(struct json_tokener *tok);
|
||||||
extern struct json_object* json_tokener_parse(char *str);
|
extern struct json_object* json_tokener_parse(char *str);
|
||||||
|
|||||||
@@ -258,4 +258,7 @@ extern int lh_table_delete_entry(struct lh_table *t, struct lh_entry *e);
|
|||||||
extern int lh_table_delete(struct lh_table *t, void *k);
|
extern int lh_table_delete(struct lh_table *t, void *k);
|
||||||
|
|
||||||
|
|
||||||
|
void lh_abort(const char *msg, ...);
|
||||||
|
void lh_table_resize(struct lh_table *t, int new_size);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ struct printbuf {
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern struct printbuf*
|
extern struct printbuf*
|
||||||
printbuf_new();
|
printbuf_new(void);
|
||||||
|
|
||||||
extern int
|
extern int
|
||||||
printbuf_memappend(struct printbuf *p, char *buf, int size);
|
printbuf_memappend(struct printbuf *p, char *buf, int size);
|
||||||
|
|||||||
Reference in New Issue
Block a user