Changeset f73b969 for irc.c

Timestamp:

2006-01-20T15:15:49Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

54879ab, f1d38f2

Parents:

55ec2d6

Message:

Renamed commands.c, got rid of return values in all command functions.

File:

• irc.c (modified) (10 diffs)

irc.c

@@ -152 +152 @@
 }
 
+/* immed=1 makes this function pretty much equal to irc_free(), except that
+   this one will "log". In case the connection is already broken and we
+   shouldn't try to write to it. */
 void irc_abort( irc_t *irc, int immed, char *format, ... )
 {
-        va_list params;
-        
         if( format != NULL )
         {
+                va_list params;
                 char *reason;
                 
                 va_start( params, format );
-                reason = g_strdup_printf( format, params );
+                reason = g_strdup_vprintf( format, params );
                 va_end( params );
                 
@@ -168 +170 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick, irc->host, reason" );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, reason );
                 
                 g_free( reason );
@@ -178 +180 @@
                 
                 ipc_to_master_str( "OPERMSG :Client exiting: %s@%s [%s]\r\n",
-                                   irc->nick, irc->host, "No reason given" );
+                                   irc->nick ? irc->nick : "(NONE)", irc->host, "No reason given" );
         }
         
@@ -339 +341 @@
 }
 
-int irc_process( irc_t *irc )
+void irc_process( irc_t *irc )
 {
         char **lines, *temp, **cmd;
@@ -361 +363 @@
                         if( ( cmd = irc_parse_line( lines[i] ) ) == NULL )
                                 continue;
-                        if( !irc_exec( irc, cmd ) )
-                        {
-                                g_free( cmd );
-                                g_free( lines );
-                                return 0;
-                        }
+                        irc_exec( irc, cmd );
                         
                         g_free( cmd );
+                        
+                        /* Shouldn't really happen, but just in case... */
+                        if( !g_slist_find( irc_connection_list, irc ) )
+                        {
+                                g_free( lines );
+                                return;
+                        }
                 }
                 
@@ -379 +383 @@
                 g_free( lines );
         }
-        
-        return 1;       
 }
 
@@ -972 +974 @@
                 
                 if( u->send_handler )
-                        return( u->send_handler( irc, u, s, flags ) );
+                {
+                        u->send_handler( irc, u, s, flags );
+                        return 1;
+                }
         }
         else if( c && c->gc && c->gc->prpl )
@@ -998 +1003 @@
 }
 
-int buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
-{
-        if( !u || !u->gc ) return( 0 );
+void buddy_send_handler( irc_t *irc, user_t *u, char *msg, int flags )
+{
+        if( !u || !u->gc ) return;
         
         if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 )
@@ -1036 +1041 @@
                         g_source_remove( u->sendbuf_timer );
                 u->sendbuf_timer = g_timeout_add( delay, buddy_send_handler_delayed, u );
-                
-                return( 1 );
         }
         else
         {
-                return( serv_send_im( irc, u, msg, flags ) );
+                serv_send_im( irc, u, msg, flags );
         }
 }
@@ -1146 +1149 @@
         if( rv > 0 )
         {
-                irc_abort( irc, "ERROR :Closing Link: Ping Timeout: %d seconds", rv );
+                irc_abort( irc, 0, "Ping Timeout: %d seconds", rv );
                 return FALSE;
         }