From 0b9a3f4aef00a8a20ed6d64569e5eca96ff3379e Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Tue, 8 Apr 2008 13:02:56 +0000 Subject: [PATCH] Factor strchr call. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4802 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/expandos.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/expandos.c b/src/core/expandos.c index 4c483ccd..bbebe993 100644 --- a/src/core/expandos.c +++ b/src/core/expandos.c @@ -343,6 +343,7 @@ static char *expando_cmdchar(SERVER_REC *server, void *item, int *free_ret) static char *expando_chanmode(SERVER_REC *server, void *item, int *free_ret) { char *cmode; + char *args; *free_ret = FALSE; @@ -354,8 +355,9 @@ static char *expando_chanmode(SERVER_REC *server, void *item, int *free_ret) *free_ret = TRUE; cmode = g_strdup(CHANNEL(item)->mode); - if (strchr(cmode, ' ') != NULL) - *(strchr(cmode, ' ')) = 0; + args = strchr(cmode, ' '); + if (args != NULL) + *args = 0; return cmode; }