Changeset fa75134

Timestamp:

2008-04-01T23:07:21Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4af7b4f, 5be87b2, 5f5d433, 69aaf14, 883a398, dd34575, f1e7407

Parents:

ddba0ae

Message:

Reordered irc_free() a little bit, hoping that this will fix a crash-on-quit
bug I can't figure out. The previous order wasn't optimal.

Files:

• account.c (modified) (2 diffs)
• irc.c (modified) (4 diffs)

account.c

@@ -182 +182 @@
         account_t *a, *l = NULL;
         
+        if( acc->ic )
+                /* Caller should have checked, accounts still in use can't be deleted. */
+                return;
+        
         for( a = irc->accounts; a; a = (l=a)->next )
                 if( a == acc )
                 {
-                        if( a->ic ) return; /* Caller should have checked, accounts still in use can't be deleted. */
-                        
                         if( l )
-                        {
                                 l->next = a->next;
-                        }
                         else
-                        {
                                 irc->accounts = a->next;
-                        }
                         
                         while( a->set )
@@ -203 +201 @@
                         g_free( a->user );
                         g_free( a->pass );
-                        if( a->server ) g_free( a->server );
+                        g_free( a->server );
                         if( a->reconnect )      /* This prevents any reconnect still queued to happen */
                                 cancel_auto_reconnect( a );

irc.c

@@ -220 +220 @@
 
 /* Because we have no garbage collection, this is quite annoying */
-void irc_free(irc_t * irc)
-{
-        account_t *account;
+void irc_free( irc_t * irc )
+{
         user_t *user, *usertmp;
         
@@ -231 +230 @@
                         irc_usermsg( irc, "Error while saving settings!" );
         
-        closesocket( irc->fd );
+        irc_connection_list = g_slist_remove( irc_connection_list, irc );
+        
+        while( irc->accounts )
+        {
+                if( irc->accounts->ic )
+                        imc_logout( irc->accounts->ic, FALSE );
+                else if( irc->accounts->reconnect )
+                        cancel_auto_reconnect( irc->accounts );
+                
+                if( irc->accounts->ic == NULL )
+                        account_del( irc, irc->accounts );
+                else
+                        /* Nasty hack, but account_del() doesn't work in this
+                           case and we don't want infinite loops, do we? ;-) */
+                        irc->accounts = irc->accounts->next;
+        }
+        
+        while( irc->queries != NULL )
+                query_del( irc, irc->queries );
+        
+        while( irc->set )
+                set_del( &irc->set, irc->set->key );
+        
+        if (irc->users != NULL)
+        {
+                user = irc->users;
+                while( user != NULL )
+                {
+                        g_free( user->nick );
+                        g_free( user->away );
+                        g_free( user->handle );
+                        if( user->user != user->nick ) g_free( user->user );
+                        if( user->host != user->nick ) g_free( user->host );
+                        if( user->realname != user->nick ) g_free( user->realname );
+                        b_event_remove( user->sendbuf_timer );
+                                        
+                        usertmp = user;
+                        user = user->next;
+                        g_free( usertmp );
+                }
+        }
         
         if( irc->ping_source_id > 0 )
@@ -239 +278 @@
                 b_event_remove( irc->w_watch_source_id );
         
-        irc_connection_list = g_slist_remove( irc_connection_list, irc );
-        
-        for (account = irc->accounts; account; account = account->next) {
-                if (account->ic) {
-                        imc_logout(account->ic, TRUE);
-                } else if (account->reconnect) {
-                        cancel_auto_reconnect(account);
-                }
-        }
-        
-        g_free(irc->sendbuffer);
-        g_free(irc->readbuffer);
-        
-        g_free(irc->nick);
-        g_free(irc->user);
-        g_free(irc->host);
-        g_free(irc->realname);
-        g_free(irc->password);
-        
-        g_free(irc->myhost);
-        g_free(irc->mynick);
-        
-        g_free(irc->channel);
-        
-        while (irc->queries != NULL)
-                query_del(irc, irc->queries);
-        
-        while (irc->accounts)
-                if (irc->accounts->ic == NULL)
-                        account_del(irc, irc->accounts);
-                else
-                        /* Nasty hack, but account_del() doesn't work in this
-                           case and we don't want infinite loops, do we? ;-) */
-                        irc->accounts = irc->accounts->next;
-        
-        while (irc->set)
-                set_del(&irc->set, irc->set->key);
-        
-        if (irc->users != NULL) {
-                user = irc->users;
-                while (user != NULL) {
-                        g_free(user->nick);
-                        g_free(user->away);
-                        g_free(user->handle);
-                        if(user->user!=user->nick) g_free(user->user);
-                        if(user->host!=user->nick) g_free(user->host);
-                        if(user->realname!=user->nick) g_free(user->realname);
-                        b_event_remove(user->sendbuf_timer);
-                                        
-                        usertmp = user;
-                        user = user->next;
-                        g_free(usertmp);
-                }
-        }
-        
-        g_hash_table_foreach_remove(irc->userhash, irc_free_hashkey, NULL);
-        g_hash_table_destroy(irc->userhash);
-        
-        g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
-        g_hash_table_destroy(irc->watches);
+        closesocket( irc->fd );
+        irc->fd = -1;
+        
+        g_hash_table_foreach_remove( irc->userhash, irc_free_hashkey, NULL );
+        g_hash_table_destroy( irc->userhash );
+        
+        g_hash_table_foreach_remove( irc->watches, irc_free_hashkey, NULL );
+        g_hash_table_destroy( irc->watches );
         
         if( irc->iconv != (GIConv) -1 )
@@ -305 +292 @@
                 g_iconv_close( irc->oconv );
         
+        g_free( irc->sendbuffer );
+        g_free( irc->readbuffer );
+        
+        g_free( irc->nick );
+        g_free( irc->user );
+        g_free( irc->host );
+        g_free( irc->realname );
+        g_free( irc->password );
+        
+        g_free( irc->myhost );
+        g_free( irc->mynick );
+        
+        g_free( irc->channel );
+        
         g_free( irc->last_target );
         
-        g_free(irc);
+        g_free( irc );
         
         if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )