From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 29 Oct 2008 10:30:54 +0000 (-0000)
Subject: id: better wording in comments, no code changes
X-Git-Tag: 1_13_0~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e7368f16fac4ace9474090c9d1f58a145db92650;p=oweals%2Fbusybox.git

id: better wording in comments, no code changes
---

diff --git a/coreutils/id.c b/coreutils/id.c
index b00532f83..001595f67 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -84,7 +84,7 @@ static int get_groups(const char *username, gid_t rgid, gid_t *groups, int *n)
 		//if (*n < 0)
 		//	return 0;
 		//return m;
-		//commented here, happens below anyway
+		//commented out here, happens below anyway
 	} else {
 		/* On error -1 is returned, which ends up in *n */
 		int nn = getgroups(*n, groups);
@@ -152,9 +152,9 @@ int id_main(int argc UNUSED_PARAM, char **argv)
 			if (egid != rgid)
 				status |= print_group(egid, " ");
 		}
-		/* We'd rather try supplying largish buffer than
-		 * having get_groups() run twice. That might be slow
-		 * (think about "user database in remove SQL server" case) */
+		/* We are supplying largish buffer, trying
+		 * to not run get_groups() twice. That might be slow
+		 * ("user database in remote SQL server" case) */
 		groups = xmalloc(64 * sizeof(gid_t));
 		n = 64;
 		if (get_groups(username, rgid, groups, &n) < 0) {
@@ -171,14 +171,14 @@ int id_main(int argc UNUSED_PARAM, char **argv)
 				status |= print_group(groups[i], opt ? " " : prefix);
 				prefix = ",";
 			}
-			if (ENABLE_FEATURE_CLEAN_UP)
-				free(groups);
 		} else if (n < 0) { /* error in get_groups() */
 			if (!ENABLE_DESKTOP)
 				bb_error_msg_and_die("cannot get groups");
 			else
 				return EXIT_FAILURE;
 		}
+		if (ENABLE_FEATURE_CLEAN_UP)
+			free(groups);
 #if ENABLE_SELINUX
 		if (is_selinux_enabled()) {
 			if (getcon(&scontext) == 0)