keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app: Simplify option variant creation

Browse Source 
Use the new style of creating option variants directly instead of
through a helper.

Closes: #1816
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2019-04-25 11:07:58 -04:00 committed by Atomic Bot
parent 27c4e40368
commit 6334aebca1
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/rpmostree-builtin-initramfs.c
View File

@ -44,17 +44,6 @@ static GOptionEntry option_entries[] = {
{ NULL }
};
static GVariant *
get_args_variant (void)
{
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
g_variant_dict_insert (&dict, "reboot", "b", opt_reboot);
return g_variant_dict_end (&dict);
}
gboolean
rpmostree_builtin_initramfs (int argc,
char **argv,
@ -143,11 +132,16 @@ rpmostree_builtin_initramfs (int argc,
if (!opt_add_arg)
opt_add_arg = empty_strv;
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
g_variant_dict_insert (&dict, "reboot", "b", opt_reboot);
g_autoptr(GVariant) options = g_variant_ref_sink (g_variant_dict_end (&dict));
g_autofree char *transaction_address = NULL;
if (!rpmostree_os_call_set_initramfs_state_sync (os_proxy,
opt_enable,
(const char *const*)opt_add_arg,
get_args_variant (),
options,
&transaction_address,
cancellable,
error))

20
src/app/rpmostree-builtin-kargs.c
View File

@ -49,17 +49,6 @@ static GOptionEntry option_entries[] = {
{ NULL }
};
static GVariant *
get_kargs_option_variant (void)
{
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
g_variant_dict_insert (&dict, "reboot", "b", opt_reboot);
return g_variant_dict_end (&dict);
}
/*
* This function shares a similar logic as the commit_editor
* function in ostree code base. It takes old kernel arguments
@ -280,6 +269,11 @@ rpmostree_builtin_kargs (int argc,
g_autofree char *transaction_address = NULL;
char *empty_strv[] = {NULL};
GVariantDict dict;
g_variant_dict_init (&dict, NULL);
g_variant_dict_insert (&dict, "reboot", "b", opt_reboot);
g_autoptr(GVariant) options = g_variant_ref_sink (g_variant_dict_end (&dict));
if (opt_editor)
{
/* We track the kernel arg instance before the editor */
@ -320,7 +314,7 @@ rpmostree_builtin_kargs (int argc,
(const char* const*) empty_strv,
(const char* const*) empty_strv,
(const char* const*) empty_strv,
get_kargs_option_variant (),
options,
&transaction_address,
cancellable,
error))
@ -344,7 +338,7 @@ rpmostree_builtin_kargs (int argc,
(const char* const*) opt_kernel_append_strings,
(const char* const*) opt_kernel_replace_strings,
(const char* const*) opt_kernel_delete_strings,
get_kargs_option_variant (),
options,
&transaction_address,
cancellable,
error))