From 78435d620ca7c2e7e982b2cc9e0aa02242ebd8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 23 May 2023 13:46:59 +0200 Subject: [PATCH] basic/user-util: attach pointer symbol to return type, not function Surrounding code was predominantly using this style already, let's make things consistent. --- src/basic/user-util.c | 8 ++++---- src/basic/user-util.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 3325aabe4d..6bdf26b42a 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -127,7 +127,7 @@ char* getlogname_malloc(void) { return uid_to_name(uid); } -char *getusername_malloc(void) { +char* getusername_malloc(void) { const char *e; e = secure_getenv("USER"); @@ -171,7 +171,7 @@ const char* default_root_shell_at(int rfd) { return "/bin/sh"; } -const char *default_root_shell(const char *root) { +const char* default_root_shell(const char *root) { _cleanup_close_ int rfd = -EBADF; rfd = open(empty_to_root(root), O_CLOEXEC | O_DIRECTORY | O_PATH); @@ -847,7 +847,7 @@ bool valid_gecos(const char *d) { return true; } -char *mangle_gecos(const char *d) { +char* mangle_gecos(const char *d) { char *mangled; /* Makes sure the provided string becomes valid as a GEGOS field, by dropping bad chars. glibc's @@ -1059,7 +1059,7 @@ int is_this_me(const char *username) { return uid == getuid(); } -const char *get_home_root(void) { +const char* get_home_root(void) { const char *e; /* For debug purposes allow overriding where we look for home dirs */ diff --git a/src/basic/user-util.h b/src/basic/user-util.h index c82941dd81..8b829a9ae2 100644 --- a/src/basic/user-util.h +++ b/src/basic/user-util.h @@ -103,7 +103,7 @@ typedef enum ValidUserFlags { bool valid_user_group_name(const char *u, ValidUserFlags flags); bool valid_gecos(const char *d); -char *mangle_gecos(const char *d); +char* mangle_gecos(const char *d); bool valid_home(const char *p); static inline bool valid_shell(const char *p) { @@ -136,7 +136,7 @@ const char* default_root_shell(const char *root); int is_this_me(const char *username); -const char *get_home_root(void); +const char* get_home_root(void); static inline bool hashed_password_is_locked_or_invalid(const char *password) { return password && password[0] != '$';