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

[srvx.git] / src / hash.h

diff --git a/src/hash.h b/src/hash.h
index a1a2c9194d6bf57257764a1b6de4067bd0f8e1b0..71b925182bba7f945faff809e66b2fbb0e2c7891 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -170,7 +170,7 @@ struct modeNode {
 struct server {
     char name[SERVERNAMEMAX+1];
     unsigned long boot;
-    unsigned long link;
+    unsigned long link_time;
     char description[SERVERDESCRIPTMAX+1];
 #ifdef WITH_PROTOCOL_P10
     char numeric[COMBO_NUMERIC_LEN+1];
@@ -205,7 +205,7 @@ int userList_contains(struct userList *list, struct userNode *user);
 typedef void (*server_link_func_t) (struct server *server);
 void reg_server_link_func(server_link_func_t handler);
 
-typedef int (*new_user_func_t) (struct userNode *user);
+typedef void (*new_user_func_t) (struct userNode *user);
 void reg_new_user_func(new_user_func_t handler);
 typedef void (*del_user_func_t) (struct userNode *user, struct userNode *killer, const char *why);
 void reg_del_user_func(del_user_func_t handler);