From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 23 May 2023 11:46:59 +0000 (+0200)
Subject: basic/user-util: attach pointer symbol to return type, not function
X-Git-Tag: v254-rc1~335^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78435d620ca7c2e7e982b2cc9e0aa02242ebd8df;p=thirdparty%2Fsystemd.git

basic/user-util: attach pointer symbol to return type, not function

Surrounding code was predominantly using this style already, let's make things
consistent.
---

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 3325aabe4d5..6bdf26b42aa 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 c82941dd814..8b829a9ae2e 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] != '$';