Changeset 3fbce97 for protocols/twitter

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

Location:

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_http.c (modified) (4 diffs)
• twitter_lib.c (modified) (4 diffs)

protocols/twitter/twitter.c

@@ -678 +678 @@
         ic->flags &= ~OPT_LOGGED_IN;
 
-        // Remove the main_loop function from the function queue.
-        b_event_remove(td->main_loop_id);
-
-        if (td->timeline_gc) {
-                imcb_chat_free(td->timeline_gc);
-        }
-
         if (td) {
+                // Remove the main_loop function from the function queue.
+                b_event_remove(td->main_loop_id);
+
+                if (td->timeline_gc) {
+                        imcb_chat_free(td->timeline_gc);
+                }
+
                 if (td->filter_update_id > 0) {
                         b_event_remove(td->filter_update_id);

protocols/twitter/twitter_http.c

@@ -24 +24 @@
 /***************************************************************************\
 *                                                                           *
-*  Some funtions within this file have been copied from other files within  *
+*  Some functions within this file have been copied from other files within  *
 *  BitlBee.                                                                 *
 *                                                                           *
@@ -53 +53 @@
         char *tmp;
         GString *request = g_string_new("");
-        void *ret;
+        void *ret = NULL;
         char *url_arguments;
         url_t *base_url = NULL;
@@ -72 +72 @@
                 base_url = g_new0(url_t, 1);
                 if (!url_set(base_url, url_string)) {
-                        g_free(base_url);
-                        return NULL;
+                        goto error;
                 }
         }
@@ -132 +131 @@
         }
 
+error:
         g_free(url_arguments);
         g_string_free(request, TRUE);

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);