Changeset 3fbce97 for protocols/twitter/twitter_http.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_http.c (modified) (4 diffs)

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