From: Andre Noll <maan@systemlinux.org>
Date: Sat, 9 Feb 2008 18:22:13 +0000 (+0100)
Subject: user_list.c: Simplify populate_user_list().
X-Git-Tag: v0.3.1~33
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5b8e525dfb2f18a4e0d67b9da264259159ad2184;p=paraslash.git

user_list.c: Simplify populate_user_list().
---

diff --git a/user_list.c b/user_list.c
index 8648f10b..5652774e 100644
--- a/user_list.c
+++ b/user_list.c
@@ -26,22 +26,19 @@ static struct list_head user_list;
  */
 static void populate_user_list(char *user_list_file)
 {
-	FILE *file_ptr = NULL;
-	char *char_ptr;
-	char line[MAXLINE];
-	/* keyword, user, key, perms */
-	char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE];
-	int num, ret;
+	int ret = -E_USERLIST;
+	FILE *file_ptr = fopen(user_list_file, "r");
 
-	file_ptr = fopen(user_list_file, "r");
-	ret = -E_USERLIST;
 	if (!file_ptr)
-		goto out;
+		goto err;
 	for (;;) {
+		int num;
+		char line[255];
+		/* keyword, name, key, perms */
+		char w[255], n[255], k[255], p[255], tmp[4][255];
 		struct user *u;
+
 		ret = para_fgets(line, MAXLINE, file_ptr);
-		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		if (ret <= 0)
 			break;
 		if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
@@ -49,13 +46,12 @@ static void populate_user_list(char *user_list_file)
 		if (strcmp(w, "user"))
 			continue;
 		PARA_DEBUG_LOG("found entry for %s\n", n);
-		u = para_malloc(sizeof(struct user));
+		u = para_malloc(sizeof(*u));
 		u->name = para_strdup(n);
 		ret = get_rsa_key(k, &u->rsa, LOAD_PUBLIC_KEY);
 		if (ret < 0)
 			break;
-		char_ptr = p;
-		num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
+		num = sscanf(p, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
 			tmp[0], tmp[1], tmp[2], tmp[3]);
 		PARA_DEBUG_LOG("found %i perm entries\n", num);
 		u->perms = 0;
@@ -75,11 +71,10 @@ static void populate_user_list(char *user_list_file)
 		}
 		para_list_add(&u->node, &user_list);
 	}
-out:
-	if (file_ptr)
-		fclose(file_ptr);
+	fclose(file_ptr);
 	if (ret >= 0)
 		return;
+err:
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }