Changeset 9e8c945

Timestamp:

2012-11-10T12:31:33Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8bd866f

Parents:

24132ec

Message:

Removed xmltree dependency entirely.

File:

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

protocols/twitter/twitter_lib.c

@@ -35 +35 @@
 #include "misc.h"
 #include "base64.h"
-#include "xmltree.h"
 #include "twitter_lib.h"
 #include "json_util.h"
@@ -257 +256 @@
  * Fill a list of ids.
  */
-static xt_status twitter_xt_get_friends_id_list(json_value *node, struct twitter_xml_list *txl)
+static gboolean twitter_xt_get_friends_id_list(json_value *node, struct twitter_xml_list *txl)
 {
         json_value *c;
@@ -267 +266 @@
         c = json_o_get(node, "ids");
         if (!c || c->type != json_array)
-                return XT_ABORT;
+                return FALSE;
 
         for (i = 0; i < c->u.array.length; i ++) {
@@ -284 +283 @@
                 txl->next_cursor = -1;
         
-        return XT_HANDLED;
+        return TRUE;
 }
 
@@ -334 +333 @@
 }
 
-static xt_status twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl);
+static gboolean twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl);
 static void twitter_http_get_users_lookup(struct http_request *req);
 
@@ -421 +420 @@
  *  - all <user>s from the <users> element.
  */
-static xt_status twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl)
+static gboolean twitter_xt_get_users(json_value *node, struct twitter_xml_list *txl)
 {
         struct twitter_xml_user *txu;
@@ -430 +429 @@
 
         if (!node || node->type != json_array)
-                return XT_ABORT;
+                return FALSE;
 
         // The root <users> node should hold the list of users <user>
@@ -440 +439 @@
         }
 
-        return XT_HANDLED;
+        return TRUE;
 }
 
@@ -457 +456 @@
  *  - the user in a twitter_xml_user struct.
  */
-static xt_status twitter_xt_get_status(const json_value *node, struct twitter_xml_status *txs)
+static gboolean twitter_xt_get_status(const json_value *node, struct twitter_xml_status *txs)
 {
         const json_value *rt = NULL, *entities = NULL;
-        int i;
         
         if (node->type != json_object)
-                return XT_ABORT;
-
-        for (i = 0; i < node->u.object.length; i ++) {
-                const char *k = node->u.object.values[i].name;
-                const json_value *v = node->u.object.values[i].value;
-                
+                return FALSE;
+
+        JSON_O_FOREACH (node, k, v) {
                 if (strcmp("text", k) == 0 && v->type == json_string) {
                         txs->text = g_memdup(v->u.string.ptr, v->u.string.length + 1);
@@ -496 +491 @@
         if (rt) {
                 struct twitter_xml_status *rtxs = g_new0(struct twitter_xml_status, 1);
-                if (twitter_xt_get_status(rt, rtxs) != XT_HANDLED) {
+                if (!twitter_xt_get_status(rt, rtxs)) {
                         txs_free(rtxs);
-                        return XT_HANDLED;
+                        return TRUE;
                 }
 
@@ -534 +529 @@
         }
 
-        return XT_HANDLED;
+        return TRUE;
 }
 
@@ -543 +538 @@
  *  - the next_cursor.
  */
-static xt_status twitter_xt_get_status_list(struct im_connection *ic, const json_value *node,
-                                            struct twitter_xml_list *txl)
+static gboolean twitter_xt_get_status_list(struct im_connection *ic, const json_value *node,
+                                           struct twitter_xml_list *txl)
 {
         struct twitter_xml_status *txs;
@@ -554 +549 @@
         
         if (node->type != json_array)
-                return XT_ABORT;
+                return FALSE;
 
         // The root <statuses> node should hold the list of statuses <status>
@@ -575 +570 @@
         }
 
-        return XT_HANDLED;
+        return TRUE;
 }