commit ff218617dbedae87f24a279ef16505a824a636d7 from: Alexander Barton date: Sat Sep 24 17:06:54 2005 UTC gcc 4: "warning: declaration of 'dup' shadows a global declaration". commit - b65358b17c8595b1616dc702bf93745dd5c75367 commit + ff218617dbedae87f24a279ef16505a824a636d7 blob - 860c5f1022c1057c19588b2eb440cde48f6f9c48 blob + 979a1a62e76fe95af877581d7e423f00ad5637f4 --- src/ngircd/conf.c +++ 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 *S 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; }