X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fenv-util.c;h=038246d21b7cd134fa34997be73d036d9ac036b2;hb=ff6a74609b7c925834da1373d3adb9642ca51422;hp=20b208f63c6a8bb0b0bf0647e0b2f5a76efd8d1f;hpb=6294aa76d818e831de4592b41a37e225fd0871f9;p=elogind.git diff --git a/src/shared/env-util.c b/src/shared/env-util.c index 20b208f63..038246d21 100644 --- a/src/shared/env-util.c +++ b/src/shared/env-util.c @@ -414,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 *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; @@ -423,8 +423,8 @@ char **strv_env_clean_log(char **e, const char *message) { bool duplicate = false; if (!env_assignment_is_valid(*p)) { - if (message) - log_error("Ignoring invalid environment '%s': %s", *p, message); + if (invalid_callback) + invalid_callback(*p, userdata); free(*p); continue; } @@ -449,7 +449,3 @@ char **strv_env_clean_log(char **e, const char *message) { return e; } - -char **strv_env_clean(char **e) { - return strv_env_clean_log(e, NULL); -}