src/: Use get_[ug]id() where appropriate

Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/src/check_subid_range.c b/src/check_subid_range.c
index 68266f55847d3a0dc53a3bbb2659eed13d1061ba..35ecf12a8a13d692f1af4e69cee4bf367997e4f6 100644 (file)
--- a/src/check_subid_range.c
+++ b/src/check_subid_range.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "atoi/getnum.h"
 #include "atoi/str2i.h"
 #include "defines.h"
 #include "prototypes.h"
@@ -20,13 +21,18 @@
 #include "idmapping.h"
 #include "shadowlog.h"
 
+
 static const char Prog[] = "check_subid_range";
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
-       char *owner;
-       unsigned long start, count;
-       bool check_uids;
+       bool           check_uids;
+       char           *owner;
+       uid_t          start;
+       unsigned long  count;
+
        log_set_progname(Prog);
        log_set_logfd(stderr);
 
@@ -36,7 +42,7 @@ int main(int argc, char **argv)
        owner = argv[1];
        check_uids = argv[2][0] == 'u';
        errno = 0;
-       if (str2ul(&start, argv[3]) == -1)
+       if (get_uid(argv[3], &start) == -1)
                exit(1);
        if (str2ul(&count, argv[4]) == -1)
                exit(1);

diff --git a/src/get_subid_owners.c b/src/get_subid_owners.c
index 1200bcb06b788d1828bc977a3a15156439f3e246..593d6f1ceada56bf524dad6c3f71bbe22b7a601b 100644 (file)
--- a/src/get_subid_owners.c
+++ b/src/get_subid_owners.c
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-#include "atoi/str2i.h"
+#include "atoi/getnum.h"
 #include "subid.h"
 #include "stdlib.h"
 #include "prototypes.h"
@@ -33,12 +33,12 @@ int main(int argc, char *argv[])
                usage();
        }
        if (argc == 3 && strcmp(argv[1], "-g") == 0) {
-               str2i(uid_t, &u, argv[2]);
+               get_uid(argv[2], &u);
                n = subid_get_gid_owners(u, &uids);
        } else if (argc == 2 && strcmp(argv[1], "-h") == 0) {
                usage();
        } else {
-               str2i(uid_t, &u, argv[1]);
+               get_gid(argv[1], &u);
                n = subid_get_uid_owners(u, &uids);
        }
        if (n < 0) {