From: Mike Yuan <me@yhndnzj.com>
Date: Mon, 29 Jan 2024 17:50:47 +0000 (+0800)
Subject: env-util: drop _pure_ for strv_env_get_n
X-Git-Tag: v256-rc1~1014^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F31120%2Fhead;p=thirdparty%2Fsystemd.git

env-util: drop _pure_ for strv_env_get_n

This function calls getenv() internally, making it
non-pure, as envvars can change between two calls
even if passed arguments are the same.
---

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index ad3130f445b..6061edb9048 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -529,7 +529,7 @@ int _strv_env_assign_many(char ***l, ...) {
         return 0;
 }
 
-char* strv_env_get_n(char **l, const char *name, size_t k, ReplaceEnvFlags flags) {
+char* strv_env_get_n(char * const *l, const char *name, size_t k, ReplaceEnvFlags flags) {
         assert(name);
 
         if (k == SIZE_MAX)
@@ -539,7 +539,7 @@ char* strv_env_get_n(char **l, const char *name, size_t k, ReplaceEnvFlags flags
 
         STRV_FOREACH_BACKWARDS(i, l)
                 if (strneq(*i, name, k) && (*i)[k] == '=')
-                        return *i + k + 1;
+                        return (char*) *i + k + 1;
 
         if (flags & REPLACE_ENV_USE_ENVIRONMENT) {
                 const char *t;
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index f722a124d94..ad127de39f8 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -53,8 +53,8 @@ int strv_env_assignf(char ***l, const char *key, const char *valuef, ...) _print
 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_;
-static inline char* strv_env_get(char **x, const char *n) {
+char* strv_env_get_n(char * const *l, const char *name, size_t k, ReplaceEnvFlags flags);
+static inline char* strv_env_get(char * const *x, const char *n) {
         return strv_env_get_n(x, n, SIZE_MAX, 0);
 }