From fe30c28e155783c4e1a3dc6e12ab6a940a746843 Mon Sep 17 00:00:00 2001 From: fukiame Date: Sat, 3 Oct 2026 00:34:49 +0700 Subject: usergen: rename getpass usergen.c:154:12: error: conflicting types for 'getpass' 154 | static int getpass(char *const password, const size_t n) | ^ /data/data/com.termux/files/usr/bin/../../usr/include/unistd.h:533:25: note: previous definition is here 533 | static __inline__ char* getpass(const char* prompt) { | ^ usergen.c:511:30: error: too many arguments to function call, expected single argument 'prompt', have 2 arguments 511 | || getpass(password, sizeof password) | ~~~~~~~ ^~~~~~~~~~~~~~~ /data/data/com.termux/files/usr/bin/../../usr/include/unistd.h:533:25: note: 'getpass' declared here 533 | static __inline__ char* getpass(const char* prompt) { | ^ ~~~~~~~~~~~~~~~~~~ 2 errors generated. Signed-off-by: fukiame --- usergen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usergen.c b/usergen.c index 5a0cf3c..53d2ff2 100644 --- a/usergen.c +++ b/usergen.c @@ -151,7 +151,7 @@ static int checkuser(const char *const username, const cJSON *const c) return 0; } -static int getpass(char *const password, const size_t n) +static int ugetpass(char *const password, const size_t n) { int ret = -1; struct termios t, ne; @@ -508,7 +508,7 @@ int main(int argc, char *argv[]) if (getuser(username, sizeof username) || checkuser(username, c) - || getpass(password, sizeof password) + || ugetpass(password, sizeof password) || getquota("a) || getmethod(method, sizeof method) || !(o = createobj(c, username, hexkey, method, quota))) -- cgit v1.2.3