Changes in ipc.c [171ef85:52744f8]

File:

• ipc.c (modified) (6 diffs)

ipc.c

@@ -258 +258 @@
         else
         {
-                ipc_master_free_fd( source );
+                GSList *l;
+                struct bitlbee_child *c;
+                
+                for( l = child_list; l; l = l->next )
+                {
+                        c = l->data;
+                        if( c->ipc_fd == source )
+                        {
+                                ipc_master_free_one( c );
+                                child_list = g_slist_remove( child_list, c );
+                                break;
+                        }
+                }
         }
         
@@ -276 +288 @@
         else
         {
-                ipc_child_disable();
+                b_event_remove( global.listen_watch_source_id );
+                close( global.listen_socket );
+                
+                global.listen_socket = -1;
         }
         
@@ -311 +326 @@
         else if( global.conf->runmode == RUNMODE_FORKDAEMON )
         {
-                if( global.listen_socket >= 0 )
-                        if( write( global.listen_socket, msg_buf, strlen( msg_buf ) ) <= 0 )
-                                ipc_child_disable();
+                write( global.listen_socket, msg_buf, strlen( msg_buf ) );
         }
         else if( global.conf->runmode == RUNMODE_DAEMON )
@@ -363 +376 @@
         {
                 int msg_len = strlen( msg_buf );
-                GSList *l, *next;
-                
-                for( l = child_list; l; l = next )
+                GSList *l;
+                
+                for( l = child_list; l; l = l->next )
                 {
                         struct bitlbee_child *c = l->data;
-                        
-                        next = l->next;
-                        if( write( c->ipc_fd, msg_buf, msg_len ) <= 0 )
-                        {
-                                ipc_master_free_one( c );
-                                child_list = g_slist_remove( child_list, c );
-                        }
+                        write( c->ipc_fd, msg_buf, msg_len );
                 }
         }
@@ -403 +410 @@
 }
 
-void ipc_master_free_fd( int fd )
-{
-        GSList *l;
-        struct bitlbee_child *c;
-        
-        for( l = child_list; l; l = l->next )
-        {
-                c = l->data;
-                if( c->ipc_fd == fd )
-                {
-                        ipc_master_free_one( c );
-                        child_list = g_slist_remove( child_list, c );
-                        break;
-                }
-        }
-}
-
 void ipc_master_free_all()
 {
@@ -429 +419 @@
         g_slist_free( child_list );
         child_list = NULL;
-}
-
-void ipc_child_disable()
-{
-        b_event_remove( global.listen_watch_source_id );
-        close( global.listen_socket );
-        
-        global.listen_socket = -1;
 }