X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fenv-util.h;h=9de3621714789892b435df2fde1fb9bdcc3b5a0b;hb=05dff23de8a7f3d9101738e4ec6ccd6f1177b3b9;hp=8d2114b64c1a4c1b17ebe63b6f91ec4e0a9d3b4d;hpb=44a6b1b68029833893f6e9cee35aa27a974038f6;p=elogind.git diff --git a/src/shared/env-util.h b/src/shared/env-util.h index 8d2114b64..9de362171 100644 --- a/src/shared/env-util.h +++ b/src/shared/env-util.h @@ -22,15 +22,16 @@ ***/ #include -#include + +#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); 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); @@ -39,6 +40,7 @@ char **strv_env_delete(char **x, unsigned n_lists, ...); /* New copy */ char **strv_env_set(char **x, const char *p); /* New copy ... */ char **strv_env_unset(char **l, const char *p); /* In place ... */ +char **strv_env_unset_many(char **l, ...) _sentinel_; char *strv_env_get_n(char **l, const char *name, size_t k) _pure_; char *strv_env_get(char **x, const char *n) _pure_;