Mon, 12 Dec 2022 23:43:39 -0600
Bump C standard to C99 for Demo protocol and fix warnings
Testing Done:
Touch all demo files, recompiled, and saw no new warnings.
Reviewed at https://reviews.imfreedom.org/r/2126/
--- a/libpurple/protocols/demo/meson.build Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/meson.build Mon Dec 12 23:43:39 2022 -0600 @@ -26,7 +26,8 @@ c_args : ['-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Purple-Demo"'], dependencies : [glib, json, libpurple_dep], install : false, - install_dir : PURPLE_PLUGINDIR) + install_dir : PURPLE_PLUGINDIR, + override_options : ['c_std=c99', 'warning_level=2']) devenv.append('PURPLE_PLUGIN_PATH', meson.current_build_dir()) endif
--- a/libpurple/protocols/demo/purpledemocontacts.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemocontacts.c Mon Dec 12 23:43:39 2022 -0600 @@ -26,9 +26,10 @@ * Helpers *****************************************************************************/ static void -purple_demo_protocol_load_status(PurpleAccount *account, PurpleGroup *group, - PurpleMetaContact *contact, PurpleBuddy *buddy, - JsonObject *buddy_object) +purple_demo_protocol_load_status(PurpleAccount *account, + G_GNUC_UNUSED PurpleGroup *group, + G_GNUC_UNUSED PurpleMetaContact *contact, + PurpleBuddy *buddy, JsonObject *buddy_object) { JsonObject *status_object = NULL; const gchar *id = NULL;
--- a/libpurple/protocols/demo/purpledemoprotocol.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemoprotocol.c Mon Dec 12 23:43:39 2022 -0600 @@ -49,7 +49,7 @@ static GList * purple_demo_protocol_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, - PurpleAccount *account) + G_GNUC_UNUSED PurpleAccount *account) { PurpleStatusType *type = NULL; GList *status_types = NULL; @@ -101,11 +101,11 @@ purple_demo_protocol_media_init)) static void -purple_demo_protocol_init(PurpleDemoProtocol *protocol) { +purple_demo_protocol_init(G_GNUC_UNUSED PurpleDemoProtocol *protocol) { } static void -purple_demo_protocol_class_finalize(PurpleDemoProtocolClass *klass) { +purple_demo_protocol_class_finalize(G_GNUC_UNUSED PurpleDemoProtocolClass *klass) { } static void
--- a/libpurple/protocols/demo/purpledemoprotocolactions.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemoprotocolactions.c Mon Dec 12 23:43:39 2022 -0600 @@ -46,7 +46,7 @@ PurpleNotification *notification = NULL; PurpleNotificationManager *notification_manager = NULL; const gchar *account_id = NULL; - static gint counter = 0; + static guint counter = 0; account_id = g_variant_get_string(parameter, NULL); account_manager = purple_account_manager_get_default(); @@ -118,7 +118,7 @@ } static void -purple_demo_protocol_failure_action_activate(GSimpleAction *action, +purple_demo_protocol_failure_action_activate(G_GNUC_UNUSED GSimpleAction *action, GVariant *parameter, const gchar *tick_str, const gchar *tick_plural_str, @@ -192,8 +192,8 @@ } static GActionGroup * -purple_demo_protocol_get_action_group(PurpleProtocolActions *actions, - PurpleConnection *connection) +purple_demo_protocol_get_action_group(G_GNUC_UNUSED PurpleProtocolActions *actions, + G_GNUC_UNUSED PurpleConnection *connection) { GSimpleActionGroup *group = NULL; GActionEntry entries[] = { @@ -222,7 +222,7 @@ } static GMenu * -purple_demo_protocol_get_menu(PurpleProtocolActions *actions) +purple_demo_protocol_get_menu(G_GNUC_UNUSED PurpleProtocolActions *actions) { GMenu *menu = NULL; GMenuItem *item = NULL;
--- a/libpurple/protocols/demo/purpledemoprotocolclient.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemoprotocolclient.c Mon Dec 12 23:43:39 2022 -0600 @@ -25,7 +25,7 @@ * PurpleProtocolClient Implementation *****************************************************************************/ static gchar * -purple_demo_protocol_status_text(PurpleProtocolClient *client, +purple_demo_protocol_status_text(G_GNUC_UNUSED PurpleProtocolClient *client, PurpleBuddy *buddy) { PurplePresence *presence = NULL;
--- a/libpurple/protocols/demo/purpledemoprotocolim.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemoprotocolim.c Mon Dec 12 23:43:39 2022 -0600 @@ -60,8 +60,8 @@ } static gint -purple_demo_protocol_send_im(PurpleProtocolIM *im, PurpleConnection *conn, - PurpleMessage *msg) +purple_demo_protocol_send_im(G_GNUC_UNUSED PurpleProtocolIM *im, + PurpleConnection *conn, PurpleMessage *msg) { const gchar *who = purple_message_get_recipient(msg);
--- a/libpurple/protocols/demo/purpledemoprotocolmedia.c Mon Dec 12 23:41:40 2022 -0600 +++ b/libpurple/protocols/demo/purpledemoprotocolmedia.c Mon Dec 12 23:43:39 2022 -0600 @@ -40,7 +40,7 @@ } static gboolean -purple_demo_protocol_media_initiate_session(PurpleProtocolMedia *media, +purple_demo_protocol_media_initiate_session(G_GNUC_UNUSED PurpleProtocolMedia *media, PurpleAccount *account, const gchar *who, PurpleMediaSessionType type)