shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

env-util: drop _pure_ for strv_env_get_n

Browse Source 
This function calls getenv() internally, making it
non-pure, as envvars can change between two calls
even if passed arguments are the same.
This commit is contained in:
Mike Yuan 2024-01-30 01:50:47 +08:00
parent 17ca151733
commit 70e80269aa
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/env-util.c
View File

@ -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;

4
src/basic/env-util.h
View File

@ -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);
}