Always initialize g_auto(GVariantBuilder)

flatpak · Nov 5, 2024 · 63319af · 63319af
1 parent 207156b
commit 63319af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/email.c b/src/email.c
@@ -213,13 +213,12 @@ handle_compose_email (XdpDbusEmail *object,
   const char *app_id = xdp_app_info_get_id (request->app_info);
   g_autoptr(GError) error = NULL;
   g_autoptr(XdpDbusImplRequest) impl_request = NULL;
-  g_auto(GVariantBuilder) options;
+  g_auto(GVariantBuilder) options =
+    G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
   g_autoptr(GVariant) attachment_fds = NULL;
 
   g_debug ("Handling ComposeEmail");
 
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-
   REQUEST_AUTOLOCK (request);
 
   impl_request = xdp_dbus_impl_request_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (impl)),

diff --git a/src/global-shortcuts.c b/src/global-shortcuts.c
@@ -233,13 +233,13 @@ handle_create_session (XdpDbusGlobalShortcuts *object,
   Request *request = request_from_invocation (invocation);
   g_autoptr(GError) error = NULL;
   g_autoptr(XdpDbusImplRequest) impl_request = NULL;
-  g_auto(GVariantBuilder) options_builder;
+  g_auto(GVariantBuilder) options_builder =
+    G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
   g_autoptr(GVariant) options = NULL;
   Session *session;
 
   REQUEST_AUTOLOCK (request);
 
-  g_variant_builder_init (&options_builder, G_VARIANT_TYPE_VARDICT);
   if (!xdp_filter_options (arg_options, &options_builder,
                            global_shortcuts_create_session_options,
                            G_N_ELEMENTS (global_shortcuts_create_session_options),
@@ -388,14 +388,13 @@ handle_bind_shortcuts (XdpDbusGlobalShortcuts *object,
   g_autoptr(GError) error = NULL;
   g_autoptr(GVariant) options = NULL;
   g_autoptr(GVariant) shortcuts = NULL;
-  g_auto(GVariantBuilder) shortcuts_builder;
-  g_auto(GVariantBuilder) options_builder;
+  g_auto(GVariantBuilder) shortcuts_builder =
+    G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_ARRAY);
+  g_auto(GVariantBuilder) options_builder =
+    G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
 
   REQUEST_AUTOLOCK (request);
 
-  g_variant_builder_init (&shortcuts_builder, G_VARIANT_TYPE_ARRAY);
-  g_variant_builder_init (&options_builder, G_VARIANT_TYPE_VARDICT);
-
   if (!xdp_filter_options (arg_options, &options_builder,
                            global_shortcuts_bind_shortcuts_options,
                            G_N_ELEMENTS (global_shortcuts_bind_shortcuts_options),