From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 12 Aug 2017 23:05:22 +0000 (+0200)
Subject: server: Initialize user list at compile time.
X-Git-Tag: v0.6.2~4^2~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7c305178150d5adb4b566e11f1a4bc2e5fe91c8e;p=paraslash.git

server: Initialize user list at compile time.

This allows the removal of the "initialized" variable, and it
simplifies user_list_init().
---

diff --git a/user_list.c b/user_list.c
index c9d265e5..8c54ab7f 100644
--- a/user_list.c
+++ b/user_list.c
@@ -13,7 +13,7 @@
 #include "list.h"
 #include "user_list.h"
 
-static struct list_head user_list;
+INITIALIZED_LIST_HEAD(user_list);
 
 /*
  * Fill the list of users known to para_server.
@@ -104,18 +104,13 @@ err:
 void user_list_init(char *user_list_file)
 {
 	struct user *u, *tmp;
-	static int initialized;
 
-	if (initialized) {
-		list_for_each_entry_safe(u, tmp, &user_list, node) {
-			list_del(&u->node);
-			free(u->name);
-			free_public_key(u->pubkey);
-			free(u);
-		}
-	} else
-		INIT_LIST_HEAD(&user_list);
-	initialized = 1;
+	list_for_each_entry_safe(u, tmp, &user_list, node) {
+		list_del(&u->node);
+		free(u->name);
+		free_public_key(u->pubkey);
+		free(u);
+	}
 	populate(user_list_file);
 }