Changeset 7a80925 for protocols

Timestamp:

2014-02-13T08:48:37Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6ae1056

Parents:

e76cf26

Message:

Update json-parser code to git rev 11a80f389769d1f66ca7fbe64ad89c82d3ba4ba9.
Few BitlBee-specific diffs now. Annoyingly need to link to libm now for the
use of the function pow() since the lib now does its own number parsing...

File:

• protocols/twitter/twitter_lib.c (modified) (4 diffs)

protocols/twitter/twitter_lib.c

@@ -164 +164 @@
 
         if (req->body_size > 0) {
-                root = json_parse(req->reply_body);
+                root = json_parse(req->reply_body, req->body_size);
                 err = json_o_get(root, "errors");
                 if (err && err->type == json_array && (err = err->u.array.values[0]) &&
@@ -220 +220 @@
         }
 
-        if ((ret = json_parse(req->reply_body)) == NULL) {
+        if ((ret = json_parse(req->reply_body, req->body_size)) == NULL) {
                 imcb_error(ic, "Could not retrieve %s: %s",
                            path, "XML parse error");
@@ -263 +263 @@
                 
                 txl->list = g_slist_prepend(txl->list,
-                        g_strdup_printf("%lld", c->u.array.values[i]->u.integer));
+                        g_strdup_printf("%" PRIu64, c->u.array.values[i]->u.integer));
         }
         
@@ -773 +773 @@
                 req->reply_body[len] = '\0';
                 
-                if ((parsed = json_parse(req->reply_body))) {
+                if ((parsed = json_parse(req->reply_body, req->body_size))) {
                         twitter_stream_handle_object(ic, parsed);
                 }