Replace strarray_length with g_strv_length

9 files changed, 7 insertions, 23 deletions

diff --git a/src/core/ignore.c b/src/core/ignore.c
index 8d5a27c2..2047dc9d 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -241,7 +241,7 @@ IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char
 		if (channels == NULL || rec->channels == NULL)
 			continue; /* other doesn't have channels */
 
-		if (strarray_length(channels) != strarray_length(rec->channels))
+		if (g_strv_length(channels) != g_strv_length(rec->channels))
 			continue; /* different amount of channels */
 
 		/* check that channels match */
diff --git a/src/core/misc.c b/src/core/misc.c
index 682d006c..70d09e55 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -150,20 +150,6 @@ int find_substr(const char *list, const char *item)
 	return FALSE;
 }
 
-int strarray_length(char **array)
-{
-	int len;
-
-	g_return_val_if_fail(array != NULL, 0);
-
-	len = 0;
-	while (*array) {
-		len++;
-                array++;
-	}
-        return len;
-}
-
 int strarray_find(char **array, const char *item)
 {
 	char **tmp;
diff --git a/src/core/misc.h b/src/core/misc.h
index fdb16a49..f8f1786f 100644
--- a/src/core/misc.h
+++ b/src/core/misc.h
@@ -102,8 +102,6 @@ char *show_lowascii(const char *str);
 /* replace all `from' chars in string to `to' chars. returns `str' */
 char *replace_chars(char *str, char from, char to);
 
-/* return how many items `array' has */
-int strarray_length(char **array);
 /* return index of `item' in `array' or -1 if not found */
 int strarray_find(char **array, const char *item);
 
diff --git a/src/core/special-vars.c b/src/core/special-vars.c
index fe6bbed2..6ca080fc 100644
--- a/src/core/special-vars.c
+++ b/src/core/special-vars.c
@@ -44,7 +44,7 @@ static char *get_argument(char **cmd, char **arglist)
 	arg = 0;
 	max = -1;
 
-	argcount = arglist == NULL ? 0 : strarray_length(arglist);
+	argcount = arglist == NULL ? 0 : g_strv_length(arglist);
 
 	if (**cmd == '*') {
 		/* get all arguments */
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 36e1e78c..4691a708 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -178,7 +178,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
 		if (channels == NULL || rec->channels == NULL)
 			continue; /* other doesn't have channels */
 
-		if (strarray_length(channels) != strarray_length(rec->channels))
+		if (g_strv_length(channels) != g_strv_length(rec->channels))
 			continue; /* different amount of channels */
 
 		/* check that channels match */
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index e3dbe72d..ca90b8d8 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -619,7 +619,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
         /* CHAT <unused> <address> <port> */
 	/* CHAT <unused> <address> 0 <id> (DCC CHAT passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 3) {
 		g_strfreev(params);
diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c
index e7b796bb..f7a95bb9 100644
--- a/src/irc/dcc/dcc-get.c
+++ b/src/irc/dcc/dcc-get.c
@@ -423,7 +423,7 @@ static void ctcp_msg_dcc_send(IRC_SERVER_REC *server, const char *data,
 	/* SEND <file name> <address> <port> <size> [...] */
 	/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 4) {
 		signal_emit("dcc error ctcp", 5, "SEND", data,
diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c
index 11b28aef..36f84ddf 100644
--- a/src/irc/dcc/dcc-resume.c
+++ b/src/irc/dcc/dcc-resume.c
@@ -88,7 +88,7 @@ static int dcc_ctcp_resume_parse(int type, const char *data, const char *nick,
 	/* RESUME|ACCEPT <file name> <port> <size> */
 	/* RESUME|ACCEPT <file name> 0 <size> <id> (passive protocol) */
 	params = g_strsplit(data, " ", -1);
-	paramcount = strarray_length(params);
+	paramcount = g_strv_length(params);
 
 	if (paramcount < 3)
 		return 0;
diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c
index 30224ff9..7ae572cd 100644
--- a/src/irc/dcc/dcc-server.c
+++ b/src/irc/dcc/dcc-server.c
@@ -245,7 +245,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
 
 			/* 120 clientnickname filesize filename */
 			params = g_strsplit(msg, " ", -1);
-			paramcount = strarray_length(params);
+			paramcount = g_strv_length(params);
 
 			if (paramcount < 3) {
 				g_strfreev(params);