Merge pull request #1084 from crrodriguez/master

misc bugfixes

3 files changed, 3 insertions, 1 deletions

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index a4678500e6..e5b457643b 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -34,6 +34,7 @@
 #include "log.h"
 
 #ifdef HAVE_SELINUX
+_printf_(2,3)
 static int null_log(int type, const char *fmt, ...) {
         return 0;
 }
diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 2b83f439a7..7234e7926a 100644
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -932,7 +932,7 @@ fail:
 }
 
 char *bus_match_to_string(struct bus_match_component *components, unsigned n_components) {
-        _cleanup_free_ FILE *f = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         char *buffer = NULL;
         size_t size = 0;
         unsigned i;
diff --git a/src/locale/localed.c b/src/locale/localed.c
index e9489f04c2..4fa84df8c0 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1092,6 +1092,7 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
 }
 
 #ifdef HAVE_XKBCOMMON
+_printf_(3, 0)
 static void log_xkb(struct xkb_context *ctx, enum xkb_log_level lvl, const char *format, va_list args) {
         const char *fmt;