diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-06-07 00:15:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 00:15:05 +0200 |
| commit | 5e9a3ad80cb1bb5b8655d5fff6ee9d1dfc4419a1 (patch) | |
| tree | e4eb609c6dd4a8b3102f861ba4deafe3aac2df78 | |
| parent | fc67fd5111ac84cd101d961fc9a5b0bc1b25613b (diff) | |
| parent | 52bb06ccd9f9bd639a454045eba1235e4133b034 (diff) | |
| download | irssi-5e9a3ad80cb1bb5b8655d5fff6ee9d1dfc4419a1.zip | |
Merge pull request #714 from dequis/dcc-fname-gcc-warnings
fe-dcc-(get|send): Fix some -Wpointer-compare with newer gcc
| -rw-r--r-- | src/fe-common/irc/dcc/fe-dcc-get.c | 2 | ||||
| -rw-r--r-- | src/fe-common/irc/dcc/fe-dcc-send.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fe-common/irc/dcc/fe-dcc-get.c b/src/fe-common/irc/dcc/fe-dcc-get.c index 675cab65..99b6b963 100644 --- a/src/fe-common/irc/dcc/fe-dcc-get.c +++ b/src/fe-common/irc/dcc/fe-dcc-get.c @@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick, g_return_if_fail(fname != NULL); if (g_ascii_strcasecmp(type, "GET") != 0) return; - if (fname == '\0') fname = "(ANY)"; + if (fname == NULL || *fname == '\0') fname = "(ANY)"; printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_NOT_FOUND, nick, fname); } diff --git a/src/fe-common/irc/dcc/fe-dcc-send.c b/src/fe-common/irc/dcc/fe-dcc-send.c index 1fc43abd..7920bedc 100644 --- a/src/fe-common/irc/dcc/fe-dcc-send.c +++ b/src/fe-common/irc/dcc/fe-dcc-send.c @@ -108,7 +108,7 @@ static void dcc_error_close_not_found(const char *type, const char *nick, g_return_if_fail(fname != NULL); if (g_ascii_strcasecmp(type, "SEND") != 0) return; - if (fname == '\0') fname = "(ANY)"; + if (fname == NULL || *fname == '\0') fname = "(ANY)"; printformat(NULL, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_NOT_FOUND, nick, fname); } |