Changeset ba9edaa for protocols/http_client.c

Timestamp:

2006-05-10T17:34:46Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

13cc96c

Parents:

67b6766

Message:

Moved everything to the BitlBee event handling API.

File:

• protocols/http_client.c (modified) (10 diffs)

protocols/http_client.c

@@ -32 +32 @@
 
 
-static void http_connected( gpointer data, int source, GaimInputCondition cond );
-static void http_ssl_connected( gpointer data, void *source, GaimInputCondition cond );
-static void http_incoming_data( gpointer data, int source, GaimInputCondition cond );
+static gboolean http_connected( gpointer data, int source, b_input_condition cond );
+static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond );
+static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond );
 
 
@@ -73 +73 @@
 /* This one is actually pretty simple... Might get more calls if we can't write 
    the whole request at once. */
-static void http_connected( gpointer data, int source, GaimInputCondition cond )
+static gboolean http_connected( gpointer data, int source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -82 +82 @@
         
         if( req->inpa > 0 )
-                gaim_input_remove( req->inpa );
+                b_event_remove( req->inpa );
         
         sock_make_nonblocking( req->fd );
@@ -117 +117 @@
         
         if( req->bytes_written < req->request_length )
-                req->inpa = gaim_input_add( source,
-                                            req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
-                                            http_connected, req );
-        else
-                req->inpa = gaim_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
-        
-        return;
+                req->inpa = b_input_add( source,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
+                                         http_connected, req );
+        else
+                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
+        
+        return FALSE;
         
 error:
@@ -131 +131 @@
         g_free( req );
         
-        return;
+        return FALSE;
 }
 
-static void http_ssl_connected( gpointer data, void *source, GaimInputCondition cond )
+static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -146 +146 @@
 }
 
-static void http_incoming_data( gpointer data, int source, GaimInputCondition cond )
+static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond )
 {
         struct http_request *req = data;
@@ -155 +155 @@
         
         if( req->inpa > 0 )
-                gaim_input_remove( req->inpa );
+                b_event_remove( req->inpa );
         
         if( req->ssl )
@@ -202 +202 @@
         
         /* There will be more! */
-        req->inpa = gaim_input_add( req->fd,
-                                    req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
-                                    http_incoming_data, req );
-        
-        return;
+        req->inpa = b_input_add( req->fd,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
+                                 http_incoming_data, req );
+        
+        return FALSE;
 
 got_reply:
@@ -362 +362 @@
                 req->reply_headers = req->reply_body = NULL;
                 
-                return;
+                return FALSE;
         }
         
@@ -380 +380 @@
         g_free( req->reply_headers );
         g_free( req );
+        
+        return FALSE;
 }