From 140c57dbadd779851991b809b1a492e4d74c3ea2 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 14 Oct 2015 17:20:32 +0100 Subject: Fix all the things that prevent clang (3.5) from building LightDM with -Werror. --- liblightdm-gobject/user.c | 2 +- src/logger.c | 2 +- src/logger.h | 4 ++-- tests/src/X.c | 2 +- tests/src/initctl.c | 2 +- tests/src/libsystem.c | 16 ++++++++-------- tests/src/status.h | 2 +- tests/src/test-session.c | 2 +- tests/src/unity-system-compositor.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c index 7d54b6d2..50f766b0 100644 --- a/liblightdm-gobject/user.c +++ b/liblightdm-gobject/user.c @@ -538,7 +538,7 @@ lightdm_user_get_has_messages (LightDMUser *user) uid_t lightdm_user_get_uid (LightDMUser *user) { - g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL); + g_return_val_if_fail (LIGHTDM_IS_USER (user), (uid_t)-1); return common_user_get_uid (GET_USER_PRIVATE (user)->common_user); } diff --git a/src/logger.c b/src/logger.c index 23bce206..3fe0d290 100644 --- a/src/logger.c +++ b/src/logger.c @@ -3,7 +3,7 @@ G_DEFINE_INTERFACE (Logger, logger, G_TYPE_INVALID); static void -logger_logv_default (Logger *self, GLogLevelFlags log_level, const gchar *format, va_list ap); +logger_logv_default (Logger *self, GLogLevelFlags log_level, const gchar *format, va_list ap) __attribute__ ((format (printf, 3, 0))); static void logger_default_init (LoggerInterface *iface) diff --git a/src/logger.h b/src/logger.h index f139e78b..53f3bb80 100644 --- a/src/logger.h +++ b/src/logger.h @@ -44,10 +44,10 @@ gint logger_logprefix (Logger *self, gchar *buf, gulong buflen); * output of logger_logprefix() and then passes the result to * g_log() */ -void logger_logv (Logger *self, GLogLevelFlags log_level, const gchar *format, va_list ap); +void logger_logv (Logger *self, GLogLevelFlags log_level, const gchar *format, va_list ap) __attribute__ ((format (printf, 3, 0))); /*! \brief convenience wrapper around \c logger_logv() */ -void logger_log (Logger *self, GLogLevelFlags log_level, const gchar *format, ...); +void logger_log (Logger *self, GLogLevelFlags log_level, const gchar *format, ...) __attribute__ ((format (printf, 3, 4))); /* convenience wrappers around logger_log() */ #define l_debug(self, ...) \ diff --git a/tests/src/X.c b/tests/src/X.c index b737ddbd..1a294fea 100644 --- a/tests/src/X.c +++ b/tests/src/X.c @@ -386,7 +386,7 @@ main (int argc, char **argv) g_string_append (status_text, " SHAREVTS=TRUE"); if (mir_id != NULL) g_string_append_printf (status_text, " MIR-ID=%s", mir_id); - status_notify (status_text->str); + status_notify ("%s", status_text->str); g_string_free (status_text, TRUE); if (g_key_file_has_key (config, "test-xserver-config", "return-value", NULL)) diff --git a/tests/src/initctl.c b/tests/src/initctl.c index 092e8b90..600cea98 100644 --- a/tests/src/initctl.c +++ b/tests/src/initctl.c @@ -22,7 +22,7 @@ main (int argc, char **argv) status_text = g_string_new ("INIT"); for (i = 1; i < argc; i++) g_string_append_printf (status_text, " %s", argv[i]); - status_notify (status_text->str); + status_notify ("%s", status_text->str); g_string_free (status_text, TRUE); } diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c index 52758272..ab8eeac8 100644 --- a/tests/src/libsystem.c +++ b/tests/src/libsystem.c @@ -824,7 +824,7 @@ pam_start (const char *service_name, const char *user, const struct pam_conv *co g_string_append_printf (status, " SERVICE=%s", service_name); if (user) g_string_append_printf (status, " USER=%s", user); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -862,7 +862,7 @@ pam_authenticate (pam_handle_t *pamh, int flags) if (flags & PAM_DISALLOW_NULL_AUTHTOK) g_string_append (status, " DISALLOW_NULL_AUTHTOK"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1240,7 +1240,7 @@ pam_open_session (pam_handle_t *pamh, int flags) if (flags & PAM_SILENT) g_string_append (status, " SILENT"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1300,7 +1300,7 @@ pam_close_session (pam_handle_t *pamh, int flags) if (flags & PAM_SILENT) g_string_append (status, " SILENT"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1325,7 +1325,7 @@ pam_acct_mgmt (pam_handle_t *pamh, int flags) if (flags & PAM_DISALLOW_NULL_AUTHTOK) g_string_append (status, " DISALLOW_NULL_AUTHTOK"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1365,7 +1365,7 @@ pam_chauthtok (pam_handle_t *pamh, int flags) if (flags & PAM_CHANGE_EXPIRED_AUTHTOK) g_string_append (status, " CHANGE_EXPIRED_AUTHTOK"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1425,7 +1425,7 @@ pam_setcred (pam_handle_t *pamh, int flags) if (flags & PAM_REFRESH_CRED) g_string_append (status, " REFRESH_CRED"); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } @@ -1484,7 +1484,7 @@ pam_end (pam_handle_t *pamh, int pam_status) status = g_string_new (""); g_string_append_printf (status, "%s END", pamh->id); - status_notify (status->str); + status_notify ("%s", status->str); g_string_free (status, TRUE); } diff --git a/tests/src/status.h b/tests/src/status.h index c88822f2..29d19370 100644 --- a/tests/src/status.h +++ b/tests/src/status.h @@ -11,7 +11,7 @@ typedef void (*StatusRequestFunc)(const gchar *name, GHashTable *params); gboolean status_connect (StatusRequestFunc message_cb, const gchar *id); -void status_notify (const gchar *format, ...); +void status_notify (const gchar *format, ...) __attribute__((format (printf, 1, 2))); #ifdef __cplusplus } diff --git a/tests/src/test-session.c b/tests/src/test-session.c index 1e39a724..a869fadb 100644 --- a/tests/src/test-session.c +++ b/tests/src/test-session.c @@ -300,7 +300,7 @@ main (int argc, char **argv) if (argc > 1) g_string_append_printf (status_text, " NAME=%s", argv[1]); g_string_append_printf (status_text, " USER=%s", getenv ("USER")); - status_notify (status_text->str); + status_notify ("%s", status_text->str); g_string_free (status_text, TRUE); config = g_key_file_new (); diff --git a/tests/src/unity-system-compositor.c b/tests/src/unity-system-compositor.c index cdb70114..ab6ea114 100644 --- a/tests/src/unity-system-compositor.c +++ b/tests/src/unity-system-compositor.c @@ -209,7 +209,7 @@ main (int argc, char **argv) g_string_append (status_text, " TEST=TRUE"); if (container) g_string_append (status_text, " CONTAINER=TRUE"); - status_notify (status_text->str); + status_notify ("%s", status_text->str); g_string_free (status_text, TRUE); config = g_key_file_new (); -- cgit v1.2.1