]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
cgconfigparser: Fixed checking of getpw/grnam_r return codes
authorJan Safranek <jsafrane@redhat.com>
Wed, 24 Aug 2011 09:39:44 +0000 (11:39 +0200)
committerJan Safranek <jsafrane@redhat.com>
Wed, 14 Sep 2011 11:21:00 +0000 (13:21 +0200)
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>
src/config.c

index 3e67b4ff9867cde03c0d6cce2417e736243d9df9..28519ffdd385388647929411a1ac462115fe793b 100644 (file)
@@ -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) {