summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJilles Tjoelker <jilles@irssi.org>2009-02-28 20:51:22 +0000
committerjilles <jilles@dbcabf3a-b0e7-0310-adc4-f8d773084564>2009-02-28 20:51:22 +0000
commit4f3b7696a0f0964310cd095e7a80ea1d27b5a5d9 (patch)
treece0bd20fa2a5b10870e8858424d6222b052eb0ad /src/core
parent8a6b0224b937e579d52d1a526de9197a1f1c1e54 (diff)
downloadirssi-4f3b7696a0f0964310cd095e7a80ea1d27b5a5d9.zip
Correct assertions.
Found using llvm static analyzer. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5027 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
-rw-r--r--src/core/expandos.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/expandos.c b/src/core/expandos.c
index c27446da..bed6c5eb 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -71,7 +71,7 @@ void expando_create(const char *key, EXPANDO_FUNC func, ...)
const char *signal;
va_list va;
- g_return_if_fail(key != NULL || *key == '\0');
+ g_return_if_fail(key != NULL && *key != '\0');
g_return_if_fail(func != NULL);
if (key[1] != '\0')
@@ -136,7 +136,7 @@ void expando_destroy(const char *key, EXPANDO_FUNC func)
gpointer origkey, value;
EXPANDO_REC *rec;
- g_return_if_fail(key != NULL || *key == '\0');
+ g_return_if_fail(key != NULL && *key != '\0');
g_return_if_fail(func != NULL);
if (key[1] == '\0') {