Changeset 3fbce97 for protocols/twitter/twitter_lib.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

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

protocols/twitter/twitter_lib.c

@@ -314 +314 @@
         td = ic->proto_data;
 
+        // Parse the data.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->follow_ids;
-
-        // Parse the data.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
 
         twitter_xt_get_friends_id_list(parsed, txl);
@@ -390 +390 @@
         }
 
+        // Get the user list from the parsed xml feed.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = NULL;
 
-        // Get the user list from the parsed xml feed.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
         twitter_xt_get_users(parsed, txl);
         json_value_free(parsed);
@@ -1389 +1390 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);
@@ -1428 +1430 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);