From 1bcd7a8dd09e59f01d5c42b43182a0466f604bd5 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 7 Jun 2017 00:15:05 +0200 Subject: [PATCH] Merge pull request #714 from dequis/dcc-fname-gcc-warnings fe-dcc-(get|send): Fix some -Wpointer-compare with newer gcc (cherry picked from commit 5e9a3ad80cb1bb5b8655d5fff6ee9d1dfc4419a1) --- src/fe-common/irc/dcc/fe-dcc-get.c | 2 +- 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); }