From ff218617dbedae87f24a279ef16505a824a636d7 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 24 Sep 2005 17:06:54 +0000 Subject: [PATCH] gcc 4: "warning: declaration of 'dup' shadows a global declaration". --- src/ngircd/conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 860c5f10..979a1a62 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: conf.c,v 1.86 2005/09/10 23:42:12 fw Exp $"; +static char UNUSED id[] = "$Id: conf.c,v 1.87 2005/09/24 17:06:54 alex Exp $"; #include "imp.h" #include @@ -76,10 +76,10 @@ static void Init_Server_Struct PARAMS(( CONF_SERVER *Server )); static char * strdup_warn(const char *str) { - char *dup = strdup(str); - if (!dup) + char *ptr = strdup(str); + if (!ptr) Config_Error(LOG_ERR, "Could not allocate mem for string: %s", str); - return dup; + return ptr; }