core: make setting the shutdown watchdog configuration via dbus work

[elogind.git] / src / tmpfiles / tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index d70dbc470753676428c8b7fa6c47b8bd54118b24..473c51166b49daf368975270f9559f5a707f1357 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -879,17 +879,13 @@ static int item_do_children(Item *i, const char *path, action_t action) {
 }
 
 static int glob_item(Item *i, action_t action, bool recursive) {
-DISABLE_WARNING_INCOMPATIBLE_POINTER_TYPES
-DISABLE_WARNING_DECLARATION_AFTER_STATEMENT
         _cleanup_globfree_ glob_t g = {
-                .gl_closedir = closedir,
-                .gl_readdir = readdir,
-                .gl_opendir = opendir_nomod,
+                .gl_closedir = (void (*)(void *)) closedir,
+                .gl_readdir = (struct dirent *(*)(void *)) readdir,
+                .gl_opendir = (void *(*)(const char *)) opendir_nomod,
                 .gl_lstat = lstat,
                 .gl_stat = stat,
         };
-REENABLE_WARNING
-REENABLE_WARNING
         int r = 0, k;
         char **fn;
 
@@ -1753,8 +1749,8 @@ static void help(void) {
                "     --clean                Clean up marked directories\n"
                "     --remove               Remove marked files/directories\n"
                "     --boot                 Execute actions only safe at boot\n"
-               "     --prefix=PATH          Only apply rules that apply to paths with the specified prefix\n"
-               "     --exclude-prefix=PATH  Ignore rules that apply to paths with the specified prefix\n"
+               "     --prefix=PATH          Only apply rules with the specified prefix\n"
+               "     --exclude-prefix=PATH  Ignore rules with the specified prefix\n"
                "     --root=PATH            Operate on an alternate filesystem root\n",
                program_invocation_short_name);
 }