Changeset 8e3b7ac for lib

Timestamp:

2012-11-08T22:38:20Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fb351ce

Parents:

0688e99

Message:

It logs in and fetches statuses! \o/ But, some corruption..

Location:

lib

Files:

• json_util.c (modified) (2 diffs)
• json_util.h (modified) (1 diff)

lib/json_util.c

@@ -27 +27 @@
 #include "json_util.h"
 
-json_value *json_o_get( json_value *obj, json_char *name )
+json_value *json_o_get( const json_value *obj, const json_char *name )
 { 
         int i;
@@ -41 +41 @@
 }
 
-const char *json_o_str( json_value *obj, json_char *name )
+const char *json_o_str( const json_value *obj, const json_char *name )
 { 
         json_value *ret = json_o_get( obj, name );
         
-        if( ret )
+        if( ret && ret->type == json_string )
                 return ret->u.string.ptr;
         else
                 return NULL;
 }
+
+char *json_o_strdup( const json_value *obj, const json_char *name )
+{
+        json_value *ret = json_o_get( obj, name );
+        
+        if( ret && ret->type == json_string && ret->u.string.ptr )
+                return g_memdup( ret->u.string.ptr, ret->u.string.length + 1 );
+        else
+                return NULL;
+}

lib/json_util.h

@@ -24 +24 @@
 #include "json.h"
 
-json_value *json_o_get( json_value *obj, json_char *name );
-const char *json_o_str( json_value *obj, json_char *name );
+#define JSON_O_FOREACH(o, k, v) \
+        char *k; json_value *v; int __i; \
+        for( __i = 0; k = (o)->u.object.values[__i].name, \
+                      v = (o)->u.object.values[__i].value, \
+                      __i < (o)->u.object.length; __i ++ )
+
+json_value *json_o_get( const json_value *obj, const json_char *name );
+const char *json_o_str( const json_value *obj, const json_char *name );
+char *json_o_strdup( const json_value *obj, const json_char *name );