From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Nov 2022 20:57:28 +0000 (+0100)
Subject: nulstr-util: modernize strv_from_nulstr() a bit
X-Git-Tag: v253-rc1~539^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0f54050006f6fe44a81e8327a858a0aea20bc9;p=thirdparty%2Fsystemd.git

nulstr-util: modernize strv_from_nulstr() a bit
---

diff --git a/src/basic/nulstr-util.h b/src/basic/nulstr-util.h
index 8c2849b1110..19f4edd3846 100644
--- a/src/basic/nulstr-util.h
+++ b/src/basic/nulstr-util.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <errno.h>
+#include <macro.h>
 #include <stdbool.h>
 #include <string.h>
 
@@ -21,12 +22,15 @@ char** strv_parse_nulstr(const char *s, size_t l);
 char** strv_split_nulstr(const char *s);
 int strv_make_nulstr(char * const *l, char **p, size_t *n);
 
-static inline int strv_from_nulstr(char ***a, const char *nulstr) {
+static inline int strv_from_nulstr(char ***ret, const char *nulstr) {
         char **t;
 
+        assert(ret);
+
         t = strv_split_nulstr(nulstr);
         if (!t)
                 return -ENOMEM;
-        *a = t;
+
+        *ret = t;
         return 0;
 }