diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/env-util.c | 11 | ||||
| -rw-r--r-- | src/shared/env-util.h | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/shared/env-util.c b/src/shared/env-util.c index fbdc73dd2c..038246d21b 100644 --- a/src/shared/env-util.c +++ b/src/shared/env-util.c @@ -28,7 +28,6 @@ #include "util.h" #include "env-util.h" #include "def.h" -#include "unit.h" #define VALID_CHARS_ENV_NAME \ DIGITS LETTERS \ @@ -415,7 +414,7 @@ char *strv_env_get(char **l, const char *name) { return strv_env_get_n(l, name, strlen(name)); } -char **strv_env_clean_log(char **e, const char *unit_id, const char *message) { +char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const char *p, void *userdata), void *userdata) { char **p, **q; int k = 0; @@ -424,8 +423,8 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) { bool duplicate = false; if (!env_assignment_is_valid(*p)) { - if (message) - log_unit_error(unit_id, "Ignoring invalid environment '%s': %s", *p, message); + if (invalid_callback) + invalid_callback(*p, userdata); free(*p); continue; } @@ -450,7 +449,3 @@ char **strv_env_clean_log(char **e, const char *unit_id, const char *message) { return e; } - -char **strv_env_clean(char **e) { - return strv_env_clean_log(e, NULL, NULL); -} diff --git a/src/shared/env-util.h b/src/shared/env-util.h index 3c6f9d743f..fb3a52b707 100644 --- a/src/shared/env-util.h +++ b/src/shared/env-util.h @@ -29,8 +29,8 @@ bool env_value_is_valid(const char *e); bool env_assignment_is_valid(const char *e); bool strv_env_is_valid(char **e); -char **strv_env_clean(char **l); -char **strv_env_clean_log(char **e, const char *unit_id, const char *message); +#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); bool strv_env_name_or_assignment_is_valid(char **l); |