Merge pull request #235 from dequis/g_strcmp0

Change all strcmp() to g_strcmp0() to handle nulls gracefully

7 files changed, 22 insertions, 22 deletions

diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c
index 38c81aab..b60e681b 100644
--- a/src/irc/core/bans.c
+++ b/src/irc/core/bans.c
@@ -188,7 +188,7 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
 			    item, &channel, &nicks)) return;
 	if (!ischannel(*channel)) cmd_param_error(CMDERR_NOT_JOINED);
 	if (*nicks == '\0') {
-		if (strcmp(data, "*") != 0)
+		if (g_strcmp0(data, "*") != 0)
 			cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
                 /* /BAN * or /UNBAN * - ban/unban everyone */
 		nicks = (char *) data;
@@ -318,7 +318,7 @@ static void cmd_unban(const char *data, IRC_SERVER_REC *server, void *item)
 static void read_settings(void)
 {
 	if (default_ban_type_str != NULL &&
-	    strcmp(default_ban_type_str, settings_get_str("ban_type")) == 0)
+	    g_strcmp0(default_ban_type_str, settings_get_str("ban_type")) == 0)
 		return;
 
 	g_free_not_null(default_ban_type_str);
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 6fdfeef3..6cb9b088 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -270,7 +270,7 @@ static void event_join(IRC_SERVER_REC *server, const char *data, const char *nic
 	}
 
 	chanrec->joined = TRUE;
-	if (strcmp(chanrec->name, channel) != 0) {
+	if (g_strcmp0(chanrec->name, channel) != 0) {
                 g_free(chanrec->name);
 		chanrec->name = g_strdup(channel);
 	}
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index 7c3d3f5f..e7fb5067 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -72,7 +72,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
 			    &target, &msg))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *msg == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -99,7 +99,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
 			    &target, &ctcpcmd, &ctcpdata))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -133,7 +133,7 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
 			    &target, &ctcpcmd, &ctcpdata))
 		return;
-	if (strcmp(target, "*") == 0)
+	if (g_strcmp0(target, "*") == 0)
 		target = item == NULL ? NULL : window_item_get_target(item);
 	if (target == NULL || *target == '\0' || *ctcpcmd == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@@ -238,7 +238,7 @@ static void cmd_invite(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *it
 		return;
 
 	if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
-	if (*channame == '\0' || strcmp(channame, "*") == 0) {
+	if (*channame == '\0' || g_strcmp0(channame, "*") == 0) {
 		if (!IS_IRC_CHANNEL(item))
 			cmd_param_error(CMDERR_NOT_JOINED);
 
@@ -284,13 +284,13 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channel, &rest))
 		return;
 
-	if (strcmp(channel, "*") == 0 || *channel == '\0') {
+	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
                         cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
-	if (strcmp(channel, "**") == 0) {
+	if (g_strcmp0(channel, "**") == 0) {
 		/* ** displays all nicks.. */
 		*channel = '\0';
 	}
@@ -313,14 +313,14 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server,
 			    PARAM_FLAG_GETREST, "names", &optlist, &channel))
 		return;
 
-	if (strcmp(channel, "*") == 0 || *channel == '\0') {
+	if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
 		if (!IS_IRC_CHANNEL(item))
                         cmd_param_error(CMDERR_NOT_JOINED);
 
 		channel = IRC_CHANNEL(item)->name;
 	}
 
-	if (strcmp(channel, "**") == 0) {
+	if (g_strcmp0(channel, "**") == 0) {
 		/* ** displays all nicks.. */
                 irc_send_cmd(server, "NAMES");
 	} else {
@@ -409,7 +409,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
 			query = qserver = queryitem->name;
 	}
 
-	if (strcmp(query, "*") == 0 &&
+	if (g_strcmp0(query, "*") == 0 &&
 	    g_hash_table_lookup(optlist, "yes") == NULL)
 		cmd_param_error(CMDERR_NOT_GOOD_IDEA);
 
@@ -810,7 +810,7 @@ static void cmd_knockout(const char *data, IRC_SERVER_REC *server,
 		for (ptr = server->knockoutlist; ptr != NULL; ptr = ptr->next) {
 			rec = ptr->data;
 			if (channel == rec->channel &&
-					!strcmp(rec->ban, banmasks))
+					!g_strcmp0(rec->ban, banmasks))
 				break;
 		}
 		if (ptr == NULL) {
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index ac1a72a1..72c17df1 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -67,13 +67,13 @@ static void check_query_changes(IRC_SERVER_REC *server, const char *nick,
 	if (query == NULL)
 		return;
 
-	if (strcmp(query->name, nick) != 0) {
+	if (g_strcmp0(query->name, nick) != 0) {
 		/* upper/lowercase chars in nick changed */
 		query_change_nick(query, nick);
 	}
 
 	if (address != NULL && (query->address == NULL ||
-				strcmp(query->address, address) != 0)) {
+				g_strcmp0(query->address, address) != 0)) {
                 /* host changed */
 		query_change_address(query, address);
 	}
@@ -109,7 +109,7 @@ static void event_nick(SERVER_REC *server, const char *data,
 	query = query_find(server, orignick);
 	if (query != NULL) {
 		params = event_get_params(data, 1, &nick);
-		if (strcmp(query->name, nick) != 0)
+		if (g_strcmp0(query->name, nick) != 0)
 			query_change_nick(query, nick);
 		g_free(params);
 	}
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index baf8a0d2..d7122eae 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -638,7 +638,7 @@ static void event_connected(IRC_SERVER_REC *server, const char *data, const char
 
 	params = event_get_params(data, 1, &nick);
 
-	if (strcmp(server->nick, nick) != 0) {
+	if (g_strcmp0(server->nick, nick) != 0) {
 		/* nick changed unexpectedly .. connected via proxy, etc. */
 		g_free(server->nick);
 		server->nick = g_strdup(nick);
diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c
index ebaf4b8f..a812691c 100644
--- a/src/irc/core/modes.c
+++ b/src/irc/core/modes.c
@@ -398,7 +398,7 @@ void parse_channel_modes(IRC_CHANNEL_REC *channel, const char *setby,
 		old_key = NULL;
 	}
 
-	if (strcmp(newmode->str, channel->mode) != 0) {
+	if (g_strcmp0(newmode->str, channel->mode) != 0) {
 		g_free(channel->mode);
 		channel->mode = g_strdup(newmode->str);
 
@@ -842,7 +842,7 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
 			return;
 	}
 
-	if (strcmp(target, "*") == 0) {
+	if (g_strcmp0(target, "*") == 0) {
 		if (!IS_IRC_CHANNEL(channel))
 			cmd_param_error(CMDERR_NOT_JOINED);
 
diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c
index 518248cb..f0a285df 100644
--- a/src/irc/core/servers-redirect.c
+++ b/src/irc/core/servers-redirect.c
@@ -339,7 +339,7 @@ static GSList *redirect_cmd_list_find(GSList *list, const char *event)
 	while (list != NULL) {
 		const char *str = list->data;
 
-		if (strcmp(str, event) == 0)
+		if (g_strcmp0(str, event) == 0)
                         break;
                 list = list->next->next;
 	}
@@ -365,7 +365,7 @@ static const char *redirect_match(REDIRECT_REC *redirect, const char *event,
 	   use the default signal */
         signal = NULL;
 	for (tmp = redirect->signals; tmp != NULL; tmp = tmp->next->next) {
-		if (strcmp(tmp->data, event) == 0) {
+		if (g_strcmp0(tmp->data, event) == 0) {
 			signal = tmp->next->data;
 			break;
 		}
@@ -527,7 +527,7 @@ server_redirect_get(IRC_SERVER_REC *server, const char *prefix,
 		next = ptr->next;
 		r = ptr->data;
 		if (prefix != NULL && r->prefix != NULL &&
-				strcmp(prefix, r->prefix)) {
+				g_strcmp0(prefix, r->prefix)) {
 			/* not from this server */
 			continue;
 		}