Changeset 4eb4c0f for irc.c

Timestamp:

2008-02-16T17:15:31Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in upstream changes

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -77 +77 @@
 
                 if( getnameinfo( (struct sockaddr *) &sock, socklen, buf,
-                                 NI_MAXHOST, NULL, -1, 0 ) == 0 )
+                                 NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
                         irc->myhost = g_strdup( ipv6_unwrap( buf ) );
@@ -88 +88 @@
 
                 if( getnameinfo( (struct sockaddr *)&sock, socklen, buf,
-                                 NI_MAXHOST, NULL, -1, 0 ) == 0 )
+                                 NI_MAXHOST, NULL, 0, 0 ) == 0 )
                 {
                         irc->host = g_strdup( ipv6_unwrap( buf ) );
@@ -199 +199 @@
         account_t *account;
         user_t *user, *usertmp;
-        help_t *helpnode, *helpnodetmp;
         
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
@@ -275 +274 @@
         g_hash_table_foreach_remove(irc->watches, irc_free_hashkey, NULL);
         g_hash_table_destroy(irc->watches);
-        
-        if (irc->help != NULL) {
-                helpnode = irc->help;
-                while (helpnode != NULL) {
-                        g_free(helpnode->string);
-                        
-                        helpnodetmp = helpnode;
-                        helpnode = helpnode->next;
-                        g_free(helpnodetmp);
-                }
-        }
         
         otr_free(irc->otr);