]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
maint: remove unused parameters to parse_user_spec()
authorPádraig Brady <P@draigBrady.com>
Sun, 22 Sep 2013 02:36:03 +0000 (03:36 +0100)
committerPádraig Brady <P@draigBrady.com>
Sun, 22 Sep 2013 02:41:46 +0000 (03:41 +0100)
* src/chown.c (main): Since "name" parameters to parse_user_spec()
are now optional, just pass NULL for those unused parameters.
* src/chroot.c (main): Likewise.

src/chown.c
src/chroot.c

index 9db0a569b98c94e55d71abf49568c301a9b9228f..375917856274de202a30661390dac74a5b5b7c37 100644 (file)
@@ -226,10 +226,9 @@ main (int argc, char **argv)
 
         case FROM_OPTION:
           {
-            char *u_dummy, *g_dummy;
             const char *e = parse_user_spec (optarg,
                                              &required_uid, &required_gid,
-                                             &u_dummy, &g_dummy);
+                                             NULL, NULL);
             if (e)
               error (EXIT_FAILURE, 0, "%s: %s", e, quote (optarg));
             break;
index b77a8bf667b0ef5fac0b50e34a57d4f9b6e7a4b5..89fd3920e84afabeea1a56d2f291a6d46bbc3ea0 100644 (file)
@@ -229,16 +229,11 @@ main (int argc, char **argv)
     {
       uid_t uid = -1;
       gid_t gid = -1;
-      char *user;
-      char *group;
-      char const *err = parse_user_spec (userspec, &uid, &gid, &user, &group);
+      char const *err = parse_user_spec (userspec, &uid, &gid, NULL, NULL);
 
       if (err)
         error (EXIT_CANCELED, errno, "%s", err);
 
-      free (user);
-      free (group);
-
       if (groups && set_additional_groups (groups))
         fail = true;