shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-04 09:18:12 +03:00
Code

env-util: replace 'char **' with 'char**'

Browse Source
This commit is contained in:
Yu Watanabe 2024-10-26 01:46:39 +09:00
parent 3d9ad7097e
commit fa402c3c1e
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

@ -266,7 +266,7 @@ static bool env_entry_has_name(const char *entry, const char *name) {
return *t == '='; return *t == '=';
} }
char **strv_env_delete(char **x, size_t n_lists, ...) { char** strv_env_delete(char **x, size_t n_lists, ...) {
size_t n, i = 0; size_t n, i = 0;
_cleanup_strv_free_ char **t = NULL; _cleanup_strv_free_ char **t = NULL;
va_list ap; va_list ap;
@ -564,7 +564,7 @@ char* strv_env_pairs_get(char **l, const char *name) {
return result; return result;
} }
char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const char *p, void *userdata), void *userdata) { char** strv_env_clean_with_callback(char **e, void (*invalid_callback)(const char *p, void *userdata), void *userdata) {
int k = 0; int k = 0;
STRV_FOREACH(p, e) { STRV_FOREACH(p, e) {

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

@ -34,14 +34,14 @@ int replace_env_argv(char **argv, char **env, char ***ret, char ***ret_unset_var
bool strv_env_is_valid(char **e); bool strv_env_is_valid(char **e);
#define strv_env_clean(l) strv_env_clean_with_callback(l, NULL, NULL) #define strv_env_clean(l) strv_env_clean_with_callback(l, NULL, NULL)
char **strv_env_clean_with_callback(char **l, void (*invalid_callback)(const char *p, void *userdata), void *userdata); char** strv_env_clean_with_callback(char **l, void (*invalid_callback)(const char *p, void *userdata), void *userdata);
bool strv_env_name_is_valid(char **l); bool strv_env_name_is_valid(char **l);
bool strv_env_name_or_assignment_is_valid(char **l); bool strv_env_name_or_assignment_is_valid(char **l);
char** _strv_env_merge(char **first, ...); char** _strv_env_merge(char **first, ...);
#define strv_env_merge(first, ...) _strv_env_merge(first, __VA_ARGS__, POINTER_MAX) #define strv_env_merge(first, ...) _strv_env_merge(first, __VA_ARGS__, POINTER_MAX)
char **strv_env_delete(char **x, size_t n_lists, ...); /* New copy */ char** strv_env_delete(char **x, size_t n_lists, ...); /* New copy */
char** strv_env_unset(char **l, const char *p); /* In place ... */ char** strv_env_unset(char **l, const char *p); /* In place ... */
char** strv_env_unset_many_internal(char **l, ...) _sentinel_; char** strv_env_unset_many_internal(char **l, ...) _sentinel_;