generator: use fflush_and_check() where appropriate

[elogind.git] / src / shared / env-util.h

diff --git a/src/shared/env-util.h b/src/shared/env-util.h
index c0b1e382af6e76bf5cb0a9e8a95e5b7277279405..803aa61cad7def354ea11335cf6ba50094ebddcb 100644 (file)
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -22,15 +22,19 @@
 ***/
 
 #include <stdbool.h>
-#include <sys/types.h>
+
+#include "macro.h"
 
 bool env_name_is_valid(const char *e);
 bool env_value_is_valid(const char *e);
 bool env_assignment_is_valid(const char *e);
 
+char *replace_env(const char *format, char **env);
+char **replace_env_argv(char **argv, char **env);
+
 bool strv_env_is_valid(char **e);
-char **strv_env_clean(char **l);
-char **strv_env_clean_log(char **e, 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);