From 17ca1517332d6b2a354ff7edfa92053f53e93938 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 30 Jan 2024 01:50:01 +0800 Subject: [PATCH 1/2] env-util: don't use strlen_ptr if known non-NULL --- src/basic/env-util.c | 7 +++---- src/basic/env-util.h | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/basic/env-util.c b/src/basic/env-util.c index 38387cb2ff..ad3130f445 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -529,17 +529,16 @@ 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 **l, const char *name, size_t k, ReplaceEnvFlags flags) { assert(name); if (k == SIZE_MAX) - k = strlen_ptr(name); + k = strlen(name); if (k <= 0) return NULL; STRV_FOREACH_BACKWARDS(i, l) - if (strneq(*i, name, k) && - (*i)[k] == '=') + if (strneq(*i, name, k) && (*i)[k] == '=') return *i + k + 1; if (flags & REPLACE_ENV_USE_ENVIRONMENT) { diff --git a/src/basic/env-util.h b/src/basic/env-util.h index 332efcf1b7..f722a124d9 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 **l, const char *name, size_t k, ReplaceEnvFlags flags) _pure_; +static inline char* strv_env_get(char **x, const char *n) { return strv_env_get_n(x, n, SIZE_MAX, 0); } From 70e80269aa8bb82c577f1585873fd9b9235c188b Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 30 Jan 2024 01:50:47 +0800 Subject: [PATCH 2/2] 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. --- src/basic/env-util.c | 4 ++-- src/basic/env-util.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/env-util.c b/src/basic/env-util.c index ad3130f445..6061edb904 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 f722a124d9..ad127de39f 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); }