From 8c3c378aea97c28fe7d542010f7c2c1988b8f05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sun, 29 Jul 2018 15:21:41 +0200 Subject: [PATCH] meson: Make missing declarations an error Detects missing includes and missing static defitions --- meson.build | 1 + src/auth.c | 2 +- src/lockscreen.c | 2 +- src/phosh.c | 2 +- src/settings.c | 6 ------ src/settings/brightness.c | 7 +++++-- src/wwan/phosh-wwan-mm.c | 2 +- tests/phoshstub.c | 2 ++ 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 8c4baf138..42c44388f 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,7 @@ test_c_args = [ '-Wcast-align', '-Wdeclaration-after-statement', ['-Werror=format-security', '-Werror=format=2'], + '-Werror=missing-declarations', '-Wformat-nonliteral', '-Wformat-security', '-Wmaybe-uninitialized', diff --git a/src/auth.c b/src/auth.c index d7696d633..c0e6937a8 100644 --- a/src/auth.c +++ b/src/auth.c @@ -63,7 +63,7 @@ pam_conversation_cb(int num_msg, const struct pam_message **msg, /* return TRUE if pin is correct, FALSE otherwise */ -gboolean +static gboolean authenticate (PhoshAuth *self, const gchar* number) { PhoshAuthPrivate *priv = phosh_auth_get_instance_private (self); diff --git a/src/lockscreen.c b/src/lockscreen.c index 0e01b2c04..c4d67cc48 100644 --- a/src/lockscreen.c +++ b/src/lockscreen.c @@ -128,7 +128,7 @@ show_unlock_page (PhoshLockscreen *self) /* callback of async auth task */ -void +static void auth_async_cb (PhoshAuth *auth, GAsyncResult *result, PhoshLockscreen *self) { PhoshLockscreenPrivate *priv; diff --git a/src/phosh.c b/src/phosh.c index 9e574579a..3489a6d32 100644 --- a/src/phosh.c +++ b/src/phosh.c @@ -646,7 +646,7 @@ phosh_shell_get_default (void) } -gboolean +static gboolean sigterm_cb (gpointer unused) { g_debug ("Cleaning up"); diff --git a/src/settings.c b/src/settings.c index 1a30a1648..d4ed5c156 100644 --- a/src/settings.c +++ b/src/settings.c @@ -44,12 +44,6 @@ typedef struct _PhoshSettings G_DEFINE_TYPE_WITH_PRIVATE (PhoshSettings, phosh_settings, GTK_TYPE_WINDOW) -GtkWidget *phosh_settings (const char* name) -{ - return g_object_new (PHOSH_TYPE_SETTINGS, "name", name, NULL); -} - - static void brightness_value_changed_cb (GtkScale *scale_brightness, gpointer *unused) { diff --git a/src/settings/brightness.c b/src/settings/brightness.c index c61c7c11c..a0042cb68 100644 --- a/src/settings/brightness.c +++ b/src/settings/brightness.c @@ -10,11 +10,14 @@ #include <gio/gio.h> #include <gtk/gtk.h> +#include "settings/brightness.h" + + GDBusProxy *brightness_proxy; gboolean setting_brightness; -void +static void brightness_changed_cb (GDBusProxy *proxy, GVariant *changed_props, GVariant *invalidated_props, @@ -85,7 +88,7 @@ brightness_init (GtkScale *scale) -void +static void brightness_set_cb (GDBusProxy *proxy, GAsyncResult *res, gpointer unused) { GError *err = NULL; diff --git a/src/wwan/phosh-wwan-mm.c b/src/wwan/phosh-wwan-mm.c index af424f6aa..64464df45 100644 --- a/src/wwan/phosh-wwan-mm.c +++ b/src/wwan/phosh-wwan-mm.c @@ -104,7 +104,7 @@ phosh_wwan_mm_update_signal_quality (PhoshWWanMM *self) } -const char * +static const char * user_friendly_access_tec (guint access_tec) { switch (access_tec) { diff --git a/tests/phoshstub.c b/tests/phoshstub.c index 82e548ff5..77f1ea7b3 100644 --- a/tests/phoshstub.c +++ b/tests/phoshstub.c @@ -1,6 +1,8 @@ /* Stubs so we don't need to run the shell */ #include <glib.h> +#include "phosh-wayland.h" +#include "phosh.h" gpointer phosh_shell_get_default (void) -- GitLab