From 4f3b7696a0f0964310cd095e7a80ea1d27b5a5d9 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Sat, 28 Feb 2009 20:51:22 +0000 Subject: [PATCH] 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 --- src/core/expandos.c | 4 ++-- 1 file 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') {