merge in upstream changes

1 files changed, 2 insertions, 14 deletions

diff --git a/irc.c b/irc.c
index 3ea0d755..ae275216 100644
--- a/irc.c
+++ b/irc.c
@@ -76,7 +76,7 @@ irc_t *irc_new( int fd )
 		char buf[NI_MAXHOST+1];
 
 		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 ) );
 		}
@@ -87,7 +87,7 @@ irc_t *irc_new( int fd )
 		char buf[NI_MAXHOST+1];
 
 		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 ) );
 		}
@@ -198,7 +198,6 @@ void irc_free(irc_t * irc)
 {
 	account_t *account;
 	user_t *user, *usertmp;
-	help_t *helpnode, *helpnodetmp;
 	
 	log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
 	
@@ -275,17 +274,6 @@ void irc_free(irc_t * irc)
 	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);
 	
 	g_free(irc);