Add a json_type_to_name() function which returns a string that describes the type...

git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@67 327403b1-1117-474d-bef2-5cb71233fd97

diff --git a/json_object.c b/json_object.c
index 054657aaf58a0cd24f5996c08a5aea025544d587..f0d432418331967b8bd2e811a4d5c039086c47f3 100644 (file)
--- a/json_object.c
+++ b/json_object.c
@@ -34,18 +34,6 @@
 const char *json_number_chars = "0123456789.+-eE";
 const char *json_hex_chars = "0123456789abcdef";
 
-#ifdef REFCOUNT_DEBUG
-static const char* json_type_name[] = {
-  "null",
-  "boolean",
-  "double",
-  "int",
-  "object",
-  "array",
-  "string",
-};
-#endif /* REFCOUNT_DEBUG */
-
 static void json_object_generic_delete(struct json_object* jso);
 static struct json_object* json_object_new(enum json_type o_type);
 
@@ -71,7 +59,7 @@ static void json_object_fini(void) {
               json_object_table->count);
       lh_foreach(json_object_table, ent) {
         struct json_object* obj = (struct json_object*)ent->v;
-        MC_DEBUG("\t%s:%p\n", json_type_name[obj->o_type], obj);
+        MC_DEBUG("\t%s:%p\n", json_type_to_name(obj->o_type), obj);
       }
     }
   }
@@ -150,7 +138,7 @@ static void json_object_generic_delete(struct json_object* jso)
 {
 #ifdef REFCOUNT_DEBUG
   MC_DEBUG("json_object_delete_%s: %p\n",
-          json_type_name[jso->o_type], jso);
+          json_type_to_name(jso->o_type), jso);
   lh_table_delete(json_object_table, jso);
 #endif /* REFCOUNT_DEBUG */
   printbuf_free(jso->_pb);
@@ -168,7 +156,7 @@ static struct json_object* json_object_new(enum json_type o_type)
   jso->_delete = &json_object_generic_delete;
 #ifdef REFCOUNT_DEBUG
   lh_table_insert(json_object_table, jso, jso);
-  MC_DEBUG("json_object_new_%s: %p\n", json_type_name[jso->o_type], jso);
+  MC_DEBUG("json_object_new_%s: %p\n", json_type_to_name(jso->o_type), jso);
 #endif /* REFCOUNT_DEBUG */
   return jso;
 }
@@ -186,7 +174,6 @@ enum json_type json_object_get_type(struct json_object *jso)
   return jso->o_type;
 }
 
-
 /* json_object_to_json_string */
 
 const char* json_object_to_json_string(struct json_object *jso)

diff --git a/json_object.h b/json_object.h
index d8fdc29d090181f2f107885651c9dc82e8dfc4cb..29a408de3ca0daad703c70556928bb4d13d53246 100644 (file)
--- a/json_object.h
+++ b/json_object.h
@@ -40,6 +40,7 @@ typedef struct json_tokener json_tokener;
 /* supported object types */
 
 typedef enum json_type {
+  /* If you change this, be sure to update json_type_to_name() too */
   json_type_null,
   json_type_boolean,
   json_type_double,

diff --git a/json_util.c b/json_util.c
index 9eca953c7ed3d6e2f2f3c6c8f4bc44339cbaea04..dab3d8c9579f8f3c7e6e48fb1277eb1a73398091 100644 (file)
--- a/json_util.c
+++ b/json_util.c
@@ -202,3 +202,26 @@ void* rpl_realloc(void* p, size_t n)
        return realloc(p, n);
 }
 #endif
+
+#define NELEM(a)        (sizeof(a) / sizeof(a[0]))
+static const char* json_type_name[] = {
+  /* If you change this, be sure to update the enum json_type definition too */
+  "null",
+  "boolean",
+  "double",
+  "int",
+  "object",
+  "array",
+  "string",
+};
+
+const char *json_type_to_name(enum json_type o_type)
+{
+       if (o_type < 0 || o_type >= NELEM(json_type_name))
+       {
+               MC_ERROR("json_type_to_name: type %d is out of range [0,%d]\n", o_type, NELEM(json_type_name));
+               return NULL;
+       }
+       return json_type_name[o_type];
+}
+

diff --git a/json_util.h b/json_util.h
index fbfcb14eb5dbb7d35de4f168829cb443ee5b800b..a77305eca08e916a85a874967ccb89b8b7492dfe 100644 (file)
--- a/json_util.h
+++ b/json_util.h
@@ -25,6 +25,12 @@ extern struct json_object* json_object_from_file(const char *filename);
 extern int json_object_to_file(char *filename, struct json_object *obj);
 extern int json_parse_int64(const char *buf, int64_t *retval);
 
+/**
+ * Return a string describing the type of the object.
+ * e.g. "int", or "object", etc...
+ */
+extern const char *json_type_to_name(enum json_type o_type);
+
 #ifdef __cplusplus
 }
 #endif