From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 18 Oct 2022 11:08:39 +0000 (+0900)
Subject: string-util: make free_and_strdup_warn() return 1 when new string is assigned
X-Git-Tag: v252-rc3~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a56dd1580d8a1324ea0dc9b4706e47d2df56535c;p=thirdparty%2Fsystemd.git

string-util: make free_and_strdup_warn() return 1 when new string is assigned
---

diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 0703c848f0a..46681ced997 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -171,9 +171,12 @@ int split_pair(const char *s, const char *sep, char **l, char **r);
 
 int free_and_strdup(char **p, const char *s);
 static inline int free_and_strdup_warn(char **p, const char *s) {
-        if (free_and_strdup(p, s) < 0)
+        int r;
+
+        r = free_and_strdup(p, s);
+        if (r < 0)
                 return log_oom();
-        return 0;
+        return r;
 }
 int free_and_strndup(char **p, const char *s, size_t l);