Changes in protocols/twitter/twitter_http.c [b235228:5983eca]

File:

• protocols/twitter/twitter_http.c (modified) (6 diffs)

protocols/twitter/twitter_http.c

@@ -47 +47 @@
  * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
  */
-struct http_request *twitter_http(struct im_connection *ic, char *url_string, http_input_function func,
-                                  gpointer data, int is_post, char **arguments, int arguments_len)
+void *twitter_http(struct im_connection *ic, char *url_string, http_input_function func,
+                   gpointer data, int is_post, char **arguments, int arguments_len)
 {
         struct twitter_data *td = ic->proto_data;
@@ -55 +55 @@
         void *ret;
         char *url_arguments;
-        url_t *base_url = NULL;
 
         url_arguments = g_strdup("");
@@ -68 +67 @@
                 }
         }
-        
-        if (strstr(url_string, "://")) {
-                base_url = g_new0(url_t, 1);
-                if (!url_set(base_url, url_string)) {
-                        g_free(base_url);
-                        return NULL;
-                }
-        }
-        
         // Make the request.
         g_string_printf(request, "%s %s%s%s%s HTTP/1.0\r\n"
@@ -82 +72 @@
                         "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
                         is_post ? "POST" : "GET",
-                        base_url ? base_url->file : td->url_path,
-                        base_url ? "" : url_string,
-                        is_post ? "" : "?", is_post ? "" : url_arguments,
-                        base_url ? base_url->host : td->url_host);
+                        td->url_path, url_string,
+                        is_post ? "" : "?", is_post ? "" : url_arguments, td->url_host);
 
         // If a pass and user are given we append them to the request.
@@ -92 +80 @@
                 char *full_url;
 
-                if (base_url)
-                        full_url = g_strdup(url_string);
-                else
-                        full_url = g_strconcat(set_getstr(&ic->acc->set, "base_url"), url_string, NULL);
+                full_url = g_strconcat(set_getstr(&ic->acc->set, "base_url"), url_string, NULL);
                 full_header = oauth_http_header(td->oauth_info, is_post ? "POST" : "GET",
                                                 full_url, url_arguments);
@@ -124 +109 @@
         }
 
-        if (base_url)
-                ret = http_dorequest(base_url->host, base_url->port, base_url->proto == PROTO_HTTPS, request->str, func, data);
-        else
-                ret = http_dorequest(td->url_host, td->url_port, td->url_ssl, request->str, func, data);
+        ret = http_dorequest(td->url_host, td->url_port, td->url_ssl, request->str, func, data);
 
         g_free(url_arguments);
         g_string_free(request, TRUE);
-        g_free(base_url);
-        return ret;
-}
-
-struct http_request *twitter_http_f(struct im_connection *ic, char *url_string, http_input_function func,
-                                    gpointer data, int is_post, char **arguments, int arguments_len, twitter_http_flags_t flags)
-{
-        struct http_request *ret = twitter_http(ic, url_string, func, data, is_post, arguments, arguments_len);
-        if (ret)
-                ret->flags |= flags;
         return ret;
 }