From 32525f1769d07260102de6b483641bb106ffbd26 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 11 Jun 2021 11:36:11 +0200 Subject: src/*.c: Make function parameters as RLS_UNUSED, if they are. --- src/main.c | 18 +++++++++--------- src/uccs-server.c | 8 ++++---- tests/Makefile.am | 2 ++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main.c b/src/main.c index 9a17576..91452cb 100644 --- a/src/main.c +++ b/src/main.c @@ -63,7 +63,7 @@ error_domain (void) /* When one of the state changes on the server emit that so that everone knows there might be a new server available. */ static void -server_status_updated (Server * server, ServerState newstate, RemoteLogon * rl) +server_status_updated (Server RLS_UNUSED *server, ServerState newstate, RemoteLogon *rl) { GVariant * array = NULL; @@ -88,7 +88,7 @@ server_status_updated (Server * server, ServerState newstate, RemoteLogon * rl) /* Looks for the config file and does some basic parsing to pull out the UCCS servers that are configured in it */ static void -find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogon * rl) +find_config_file (GKeyFile *parsed, const gchar *cmnd_line, RemoteLogon *rl) { GError * error = NULL; const gchar * file = DEFAULT_CONFIG_FILE; @@ -138,7 +138,7 @@ find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogon * rl) } gint -server_list_to_array (GVariantBuilder * builder, GList * items) +server_list_to_array (GVariantBuilder *builder, GList *items) { gint servercnt = 0; GList * head = NULL; @@ -159,7 +159,7 @@ server_list_to_array (GVariantBuilder * builder, GList * items) } static gboolean -handle_get_servers (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_servers (RemoteLogon RLS_UNUSED *rl, GDBusMethodInvocation * invocation, gpointer RLS_UNUSED user_data) { GVariant * array = NULL; @@ -207,7 +207,7 @@ handle_get_servers_login_cb (UccsServer * server, gboolean unlocked, gpointer us /* Handle the GetServerForLogin DBus call */ static gboolean -handle_get_servers_login (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_servers_login (RemoteLogon RLS_UNUSED *rl, GDBusMethodInvocation *invocation, gpointer RLS_UNUSED user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); const gchar * sender = g_dbus_method_invocation_get_sender(invocation); @@ -272,7 +272,7 @@ handle_get_servers_login (RemoteLogon * rl, GDBusMethodInvocation * invocation, /* Look through a list of servers to see if one matches a URL */ static Server * -handle_get_domains_list_helper (GList * list, const gchar * uri) +handle_get_domains_list_helper (GList *list, const gchar *uri) { if (list == NULL) return NULL; @@ -293,7 +293,7 @@ handle_get_domains_list_helper (GList * list, const gchar * uri) /* Get the cached domains for a server */ static gboolean -handle_get_domains (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_get_domains (RemoteLogon RLS_UNUSED *rl, GDBusMethodInvocation *invocation, gpointer RLS_UNUSED user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); @@ -331,7 +331,7 @@ handle_get_domains (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpoint /* Set a given server as last used */ static gboolean -handle_set_last_used_server (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data) +handle_set_last_used_server (RemoteLogon RLS_UNUSED * rl, GDBusMethodInvocation * invocation, gpointer RLS_UNUSED user_data) { GVariant * params = g_dbus_method_invocation_get_parameters(invocation); @@ -376,7 +376,7 @@ handle_set_last_used_server (RemoteLogon * rl, GDBusMethodInvocation * invocatio /* If we loose the name, tell the world and there's not much we can do */ static void -name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data) +name_lost (GDBusConnection RLS_UNUSED * connection, const gchar * name, gpointer user_data) { GMainLoop * mainloop = (GMainLoop *)user_data; diff --git a/src/uccs-server.c b/src/uccs-server.c index 8e02561..8f8a795 100644 --- a/src/uccs-server.c +++ b/src/uccs-server.c @@ -174,7 +174,7 @@ struct _hash_helper { /* GHashTable foreach item */ static gboolean -clear_hash_helper (gpointer key, gpointer value, gpointer user_data) +clear_hash_helper (gpointer key, gpointer RLS_UNUSED value, gpointer user_data) { struct _hash_helper * helper = (struct _hash_helper *)user_data; GError * error = NULL; @@ -303,7 +303,7 @@ uccs_server_finalize (GObject *object) /* Callback from the message getting complete */ static void -verify_server_cb (SoupSession * session, SoupMessage * message, gpointer user_data) +verify_server_cb (SoupSession RLS_UNUSED *session, SoupMessage *message, gpointer user_data) { UccsServer * server = UCCS_SERVER(user_data); guint statuscode = 404; @@ -341,7 +341,7 @@ verify_server (UccsServer * server) /* Callback for when the Network Manger state changes */ static void -nm_state_changed (NMClient *client, const GParamSpec *pspec, gpointer user_data) +nm_state_changed (NMClient RLS_UNUSED *client, const GParamSpec RLS_UNUSED *pspec, gpointer user_data) { g_return_if_fail(IS_UCCS_SERVER(user_data)); UccsServer * server = UCCS_SERVER(user_data); @@ -368,7 +368,7 @@ nm_state_changed (NMClient *client, const GParamSpec *pspec, gpointer user_data) /* Get the properties that can be sent by the greeter for this server */ static GVariant * -get_properties (Server * server) +get_properties (Server RLS_UNUSED *server) { GVariantBuilder propbuilder; g_variant_builder_init(&propbuilder, G_VARIANT_TYPE_ARRAY); diff --git a/tests/Makefile.am b/tests/Makefile.am index a165072..61be169 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,6 +33,7 @@ server_test_SOURCES = \ server_test_CFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -Werror \ $(SERVICE_CFLAGS) \ $(NULL) @@ -78,6 +79,7 @@ dbus_interface_CFLAGS = \ -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \ -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \ -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \ + -Werror \ $(SERVICE_CFLAGS) \ $(TEST_CFLAGS) \ $(NULL) -- cgit v1.2.3