From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 24 Aug 2011 09:39:44 +0000 (+0200)
Subject: cgconfigparser: Fixed checking of getpw/grnam_r return codes
X-Git-Tag: v0.38~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21930a012f11e826af42c483a7d0d8806bebc34f;p=thirdparty%2Flibcgroup.git

cgconfigparser: Fixed checking of getpw/grnam_r return codes

It's enough to check *result != NULL after getpwnam_r/getgrnam_r, the error
variable is completely useless.

Changelog:
  - remove error variable completelly

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/src/config.c b/src/config.c
index 3e67b4ff..28519ffd 100644
--- a/src/config.c
+++ b/src/config.c
@@ -187,7 +187,6 @@ int cgroup_config_group_task_perm(char *perm_type, char *value)
 {
 	struct passwd *pw, *pw_buffer;
 	struct group *group, *group_buffer;
-	int error;
 	long val = atoi(value);
 	char buffer[CGROUP_BUFFER_LEN];
 	struct cgroup *config_cgroup =
@@ -200,7 +199,7 @@ int cgroup_config_group_task_perm(char *perm_type, char *value)
 			if (!pw)
 				goto group_task_error;
 
-			error = getpwnam_r(value, pw, buffer, CGROUP_BUFFER_LEN,
+			getpwnam_r(value, pw, buffer, CGROUP_BUFFER_LEN,
 								&pw_buffer);
 			if (pw_buffer == NULL) {
 				free(pw);
@@ -220,7 +219,7 @@ int cgroup_config_group_task_perm(char *perm_type, char *value)
 			if (!group)
 				goto group_task_error;
 
-			error = getgrnam_r(value, group, buffer,
+			getgrnam_r(value, group, buffer,
 					CGROUP_BUFFER_LEN, &group_buffer);
 
 			if (group_buffer == NULL) {
@@ -261,7 +260,6 @@ int cgroup_config_group_admin_perm(char *perm_type, char *value)
 {
 	struct passwd *pw, *pw_buffer;
 	struct group *group, *group_buffer;
-	int error;
 	struct cgroup *config_cgroup =
 				&config_cgroup_table[cgroup_table_index];
 	long val = atoi(value);
@@ -274,7 +272,7 @@ int cgroup_config_group_admin_perm(char *perm_type, char *value)
 			if (!pw)
 				goto admin_error;
 
-			error = getpwnam_r(value, pw, buffer, CGROUP_BUFFER_LEN,
+			getpwnam_r(value, pw, buffer, CGROUP_BUFFER_LEN,
 								&pw_buffer);
 			if (pw_buffer == NULL) {
 				free(pw);
@@ -294,7 +292,7 @@ int cgroup_config_group_admin_perm(char *perm_type, char *value)
 			if (!group)
 				goto admin_error;
 
-			error = getgrnam_r(value, group, buffer,
+			getgrnam_r(value, group, buffer,
 					CGROUP_BUFFER_LEN, &group_buffer);
 
 			if (group_buffer == NULL) {