diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-07-10 23:00:56 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-07-10 23:00:56 +0000 |
| commit | dcc2e89b2e0a99645b4f49360c3b76958730563e (patch) | |
| tree | 824e1fb77f05e94a3b4cb48e051728eb9bd519a3 /src/fe-common/irc/fe-ignore.c | |
| parent | f8aa81b73c83b97aff8cf24244e0bb183a35d59c (diff) | |
| download | irssi-dcc2e89b2e0a99645b4f49360c3b76958730563e.zip | |
Enabled lots of GCC warnings, fixed those that were easy to fix.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@456 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc/fe-ignore.c')
| -rw-r--r-- | src/fe-common/irc/fe-ignore.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fe-common/irc/fe-ignore.c b/src/fe-common/irc/fe-ignore.c index 6366dd98..4cb0cf2b 100644 --- a/src/fe-common/irc/fe-ignore.c +++ b/src/fe-common/irc/fe-ignore.c @@ -165,7 +165,7 @@ static void cmd_ignore(const char *data) if (ischannel(*mask)) { chanarg = mask; - mask = ""; + mask = NULL; } channels = (chanarg == NULL || *chanarg == '\0') ? NULL : g_strsplit(replace_chars(chanarg, ',', ' '), " ", -1); @@ -176,7 +176,8 @@ static void cmd_ignore(const char *data) if (rec == NULL) { rec = g_new0(IGNORE_REC, 1); - rec->mask = *mask == '\0' ? NULL : g_strdup(mask); + rec->mask = (mask != NULL && *mask != '\0') ? + g_strdup(mask) : NULL; rec->channels = channels; } else { g_free_and_null(rec->pattern); @@ -226,10 +227,10 @@ static void cmd_unignore(const char *data) rec = tmp == NULL ? NULL : tmp->data; } else { /* with mask */ - char *chans[2] = { "*", NULL }; + const char *chans[2] = { "*", NULL }; - if (ischannel(*data)) chans[0] = (char *) data; - rec = ignore_find("*", ischannel(*data) ? NULL : data, chans); + if (ischannel(*data)) chans[0] = data; + rec = ignore_find("*", ischannel(*data) ? NULL : data, (char **) chans); } if (rec == NULL) |