aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Replace strarray_length with g_strv_length

Browse Source
This commit is contained in:
LemonBoy 2016-02-13 14:16:05 +01:00
parent 72712a0c62
commit 7a3c6fe86c
9 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ignore.c
View File

@ -241,7 +241,7 @@ IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char
if (channels == NULL || rec->channels == NULL) if (channels == NULL || rec->channels == NULL)
continue; /* other doesn't have channels */ 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 */ continue; /* different amount of channels */
/* check that channels match */ /* check that channels match */

14
src/core/misc.c
View File

@ -150,20 +150,6 @@ int find_substr(const char *list, const char *item)
return FALSE; 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) int strarray_find(char **array, const char *item)
{ {
char **tmp; char **tmp;

2
src/core/misc.h
View File

@ -102,8 +102,6 @@ char *show_lowascii(const char *str);
/* replace all `from' chars in string to `to' chars. returns `str' */ /* replace all `from' chars in string to `to' chars. returns `str' */
char *replace_chars(char *str, char from, char to); 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 */ /* return index of `item' in `array' or -1 if not found */
int strarray_find(char **array, const char *item); int strarray_find(char **array, const char *item);

2
src/core/special-vars.c
View File

@ -44,7 +44,7 @@ static char *get_argument(char **cmd, char **arglist)
arg = 0; arg = 0;
max = -1; max = -1;
argcount = arglist == NULL ? 0 : strarray_length(arglist); argcount = arglist == NULL ? 0 : g_strv_length(arglist);
if (**cmd == '*') { if (**cmd == '*') {
/* get all arguments */ /* get all arguments */

2
src/fe-common/core/hilight-text.c
View File

@ -178,7 +178,7 @@ static HILIGHT_REC *hilight_find(const char *text, char **channels)
if (channels == NULL || rec->channels == NULL) if (channels == NULL || rec->channels == NULL)
continue; /* other doesn't have channels */ 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 */ continue; /* different amount of channels */
/* check that channels match */ /* check that channels match */

2
src/irc/dcc/dcc-chat.c
View File

@ -619,7 +619,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
/* CHAT <unused> <address> <port> */ /* CHAT <unused> <address> <port> */
/* CHAT <unused> <address> 0 <id> (DCC CHAT passive protocol) */ /* CHAT <unused> <address> 0 <id> (DCC CHAT passive protocol) */
params = g_strsplit(data, " ", -1); params = g_strsplit(data, " ", -1);
paramcount = strarray_length(params); paramcount = g_strv_length(params);
if (paramcount < 3) { if (paramcount < 3) {
g_strfreev(params); g_strfreev(params);

2
src/irc/dcc/dcc-get.c
View File

@ -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> <port> <size> [...] */
/* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */ /* SEND <file name> <address> 0 <size> <id> (DCC SEND passive protocol) */
params = g_strsplit(data, " ", -1); params = g_strsplit(data, " ", -1);
paramcount = strarray_length(params); paramcount = g_strv_length(params);
if (paramcount < 4) { if (paramcount < 4) {
signal_emit("dcc error ctcp", 5, "SEND", data, signal_emit("dcc error ctcp", 5, "SEND", data,

2
src/irc/dcc/dcc-resume.c
View File

@ -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> <port> <size> */
/* RESUME|ACCEPT <file name> 0 <size> <id> (passive protocol) */ /* RESUME|ACCEPT <file name> 0 <size> <id> (passive protocol) */
params = g_strsplit(data, " ", -1); params = g_strsplit(data, " ", -1);
paramcount = strarray_length(params); paramcount = g_strv_length(params);
if (paramcount < 3) if (paramcount < 3)
return 0; return 0;

2
src/irc/dcc/dcc-server.c
View File

@ -245,7 +245,7 @@ static void dcc_server_msg(SERVER_DCC_REC *dcc, const char *msg)
/* 120 clientnickname filesize filename */ /* 120 clientnickname filesize filename */
params = g_strsplit(msg, " ", -1); params = g_strsplit(msg, " ", -1);
paramcount = strarray_length(params); paramcount = g_strv_length(params);
if (paramcount < 3) { if (paramcount < 3) {
g_strfreev(params); g_strfreev(params);