From: Karel Zak <kzak@redhat.com>
Date: Fri, 14 Sep 2018 14:26:38 +0000 (+0200)
Subject: lib/strutils: return from xstrmode()
X-Git-Tag: v2.33-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b82289b6071acfdccb1aff7beb9e63d950aac55;p=thirdparty%2Futil-linux.git

lib/strutils: return from xstrmode()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/strutils.h b/include/strutils.h
index 2e35be3c5e..f5979d936e 100644
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -88,7 +88,7 @@ static inline int strdup_to_offset(void *stru, size_t offset, const char *str)
 #define strdup_to_struct_member(_s, _m, _str) \
 		strdup_to_offset((void *) _s, offsetof(__typeof__(*(_s)), _m), _str)
 
-extern void xstrmode(mode_t mode, char *str);
+extern char *xstrmode(mode_t mode, char *str);
 
 /* Options for size_to_human_string() */
 enum
diff --git a/lib/strutils.c b/lib/strutils.c
index 88ea6f2771..b71dde596c 100644
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -486,7 +486,7 @@ void strtotimeval_or_err(const char *str, struct timeval *tv, const char *errmes
  * Converts stat->st_mode to ls(1)-like mode string. The size of "str" must
  * be 11 bytes.
  */
-void xstrmode(mode_t mode, char *str)
+char *xstrmode(mode_t mode, char *str)
 {
 	unsigned short i = 0;
 
@@ -521,6 +521,8 @@ void xstrmode(mode_t mode, char *str)
 		? (mode & S_IXOTH ? 't' : 'T')
 		: (mode & S_IXOTH ? 'x' : '-'));
 	str[i] = '\0';
+
+	return str;
 }
 
 /*