lib/, po/, src/: get_uid(): Move function to "atoi/getnum.h"

Implement it as an inline function, and add restrict and ATTR_STRING()
and ATTR_ACCESS() as appropriate.

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bcf859833bca2db970e3f8eea29db87caa77d2a9..2a65e1d797043444c8b8e0842a0af5e5ec3fe0c0 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,7 +74,6 @@ libshadow_la_SOURCES = \
        find_new_sub_uids.c \
        fputsx.c \
        get_pid.c \
-       get_uid.c \
        getdate.h \
        getdate.y \
        getdef.c \

diff --git a/lib/atoi/getnum.c b/lib/atoi/getnum.c
index 1931c0566fea8af01efd78d2d42e98a4ab78f3dd..3c67eb20b2c35849b482f197dba431822202ac8a 100644 (file)
--- a/lib/atoi/getnum.c
+++ b/lib/atoi/getnum.c
@@ -13,3 +13,4 @@
 extern inline int get_fd(const char *restrict fdstr, int *restrict fd);
 extern inline int get_gid(const char *restrict gidstr, gid_t *restrict gid);
 extern inline int get_pid(const char *restrict pidstr, pid_t *restrict pid);
+extern inline int get_uid(const char *restrict uidstr, uid_t *restrict uid);

diff --git a/lib/atoi/getnum.h b/lib/atoi/getnum.h
index a459e9099ec1aee80c02f4e35ea9ac31b3148609..efb8bcb46a6eb97b0b4379c9a71f8e84baa0a846 100644 (file)
--- a/lib/atoi/getnum.h
+++ b/lib/atoi/getnum.h
@@ -24,6 +24,8 @@ ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
 inline int get_gid(const char *restrict gidstr, gid_t *restrict gid);
 ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
 inline int get_pid(const char *restrict pidstr, pid_t *restrict pid);
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
+inline int get_uid(const char *restrict uidstr, uid_t *restrict uid);
 
 
 inline int
@@ -47,4 +49,11 @@ get_pid(const char *restrict pidstr, pid_t *restrict pid)
 }
 
 
+inline int
+get_uid(const char *restrict uidstr, uid_t *restrict uid)
+{
+       return a2i(uid_t, uid, uidstr, NULL, 10, type_min(uid_t), type_max(uid_t));
+}
+
+
 #endif  // include guard

diff --git a/lib/get_uid.c b/lib/get_uid.c
deleted file mode 100644 (file)
index 1224a9a..0000000
--- a/lib/get_uid.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2009, Nicolas François
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "atoi/a2i.h"
-#include "prototypes.h"
-
-
-int
-get_uid(const char *uidstr, uid_t *uid)
-{
-       return a2i(uid_t, uid, uidstr, NULL, 10, type_min(uid_t), type_max(uid_t));
-}

diff --git a/lib/prototypes.h b/lib/prototypes.h
index e36c5dccfec2a2f074eb621d108651e3320e46c9..6b978a97517a8a6b660c90c4ec0f4df8be898ab9 100644 (file)
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -157,9 +157,6 @@ extern int getrange (const char *range,
 /* gettime.c */
 extern time_t gettime (void);
 
-/* get_uid.c */
-extern int get_uid (const char *uidstr, uid_t *uid);
-
 /* fputsx.c */
 ATTR_ACCESS(write_only, 1, 2)
 extern /*@null@*/char *fgetsx(/*@returned@*/char *restrict, int, FILE *restrict);

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9ebbc017bbc34d5ee4270c3ea06a7641cf19e70c..78eb26407877443b9108af1dd26df536dec417b6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,7 +22,6 @@ lib/find_new_sub_gids.c
 lib/find_new_sub_uids.c
 lib/find_new_uid.c
 lib/fputsx.c
-lib/get_uid.c
 lib/getdef.c
 lib/getgr_nam_gid.c
 lib/getrange.c

diff --git a/src/usermod.c b/src/usermod.c
index 443f7b5780579dfada2faa6c69c5266185bbe5c2..4e03afbb60846d4f7d9dfca362532db96dc1fb76 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -34,6 +34,7 @@
 
 #include "alloc.h"
 #include "atoi/a2i.h"
+#include "atoi/getnum.h"
 #include "atoi/str2i.h"
 #include "chkname.h"
 #include "defines.h"