env-util: make strv_env_get() a static inline wrapper around strv_env_get_n()

Let's make length = SIZE_MAX also mean "call strlen()".

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index f3b76d6ba2e5efbef04454bb10dfea6ed62c1468..701c9f9dd79be220d4c883e32570c57a8673a2e2 100644 (file)
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -503,6 +503,8 @@ int _strv_env_assign_many(char ***l, ...) {
 char *strv_env_get_n(char **l, const char *name, size_t k, ReplaceEnvFlags flags) {
         assert(name);
 
+        if (k == SIZE_MAX)
+                k = strlen_ptr(name);
         if (k <= 0)
                 return NULL;
 
@@ -525,12 +527,6 @@ char *strv_env_get_n(char **l, const char *name, size_t k, ReplaceEnvFlags flags
         return NULL;
 }
 
-char *strv_env_get(char **l, const char *name) {
-        assert(name);
-
-        return strv_env_get_n(l, name, strlen(name), 0);
-}
-
 char *strv_env_pairs_get(char **l, const char *name) {
         char *result = NULL;
 

diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 786ae4cbb0f997541744401bdd5b3b4e713bcda7..c3fc244798efa156cf7581086d35acb175b3b91e 100644 (file)
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -53,7 +53,10 @@ int _strv_env_assign_many(char ***l, ...) _sentinel_;
 #define strv_env_assign_many(l, ...) _strv_env_assign_many(l, __VA_ARGS__, NULL)
 
 char *strv_env_get_n(char **l, const char *name, size_t k, ReplaceEnvFlags flags) _pure_;
-char *strv_env_get(char **x, const char *n) _pure_;
+static inline char *strv_env_get(char **x, const char *n) {
+        return strv_env_get_n(x, n, SIZE_MAX, 0);
+}
+
 char *strv_env_pairs_get(char **l, const char *name) _pure_;
 
 int getenv_bool(const char *p);