X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fenv-util.c;h=00c2cdd8c45e16719a2c38819b9798f09e37a31f;hb=901cf821ac8c13c78e1acb884f59baf41316fb8f;hp=20b208f63c6a8bb0b0bf0647e0b2f5a76efd8d1f;hpb=6294aa76d818e831de4592b41a37e225fd0871f9;p=elogind.git

diff --git a/src/shared/env-util.c b/src/shared/env-util.c
index 20b208f63..00c2cdd8c 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <limits.h>
-#include <sys/param.h>
 #include <unistd.h>
 
 #include "strv.h"
@@ -414,7 +413,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 +422,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 +448,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);
-}