From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 26 Jan 2015 15:39:03 +0000 (-0500)
Subject: tmpfiles: use casts instead of warning suppression
X-Git-Tag: v219~297
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ebf31a1f58d0b10ca63c928ff31b7745fc724003

tmpfiles: use casts instead of warning suppression

This warning got its own name only in gcc5, so the suppression does
not work in gcc4, and generates a warning of its own. Use a cast,
which is ugly too, but less so.
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index d70dbc470..d60d5ba6f 100644
--- 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;