Fix warnings about shadowed variables, and use -Wshadow in maintainer mode.

[srvx.git] / src / proto-bahamut.c

diff --git a/src/proto-bahamut.c b/src/proto-bahamut.c
index e7f0b2bece917659e58f79c26ac52b7524a63996..8f25c0bfbd607290f6f63ed25b2bbf71443d0970 100644 (file)
--- a/src/proto-bahamut.c
+++ b/src/proto-bahamut.c
@@ -41,7 +41,7 @@ static void privmsg_user_helper(struct userNode *un, void *data);
 void irc_svsmode(struct userNode *target, char *modes, unsigned long stamp);
 
 struct server *
-AddServer(struct server *uplink, const char *name, int hops, unsigned long boot, unsigned long link, UNUSED_ARG(const char *numeric), const char *description) {
+AddServer(struct server *uplink, const char *name, int hops, unsigned long boot, unsigned long link_time, UNUSED_ARG(const char *numeric), const char *description) {
     struct server* sNode;
 
     sNode = calloc(1, sizeof(*sNode));
@@ -49,7 +49,7 @@ AddServer(struct server *uplink, const char *name, int hops, unsigned long boot,
     safestrncpy(sNode->name, name, sizeof(sNode->name));
     sNode->hops = hops;
     sNode->boot = boot;
-    sNode->link = link;
+    sNode->link_time = link_time;
     sNode->users = dict_new();
     safestrncpy(sNode->description, description, sizeof(sNode->description));
     serverList_init(&sNode->children);
@@ -168,9 +168,8 @@ AddUser(struct server* uplink, const char *nick, const char *ident, const char *
     if (dummy) uNode->modes |= FLAGS_DUMMY;
     if (stamp) call_account_func(uNode, NULL, 0, stamp);
     if (IsLocal(uNode)) irc_user(uNode);
-    for (nn=0; (nn<nuf_used) && !uNode->dead; nn++) {
-        if (nuf_list[nn](uNode)) break;
-    }
+    for (nn=0; (nn<nuf_used) && !uNode->dead; nn++)
+        nuf_list[nn](uNode);
     return uNode;
 }