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

Port rpmostree-builtin-kargs to C++

Browse Source 
Prep for using https://cxx.rs/
This commit is contained in:
Colin Walters 2020-12-21 16:08:51 +00:00 committed by OpenShift Merge Robot
parent 9a91eecbb0
commit 642c8b1453
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -55,7 +55,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
src/app/rpmostree-libbuiltin.h \ src/app/rpmostree-libbuiltin.h \
src/app/rpmostree-polkit-agent.cxx \ src/app/rpmostree-polkit-agent.cxx \
src/app/rpmostree-polkit-agent.h \ src/app/rpmostree-polkit-agent.h \
src/app/rpmostree-builtin-kargs.c \ src/app/rpmostree-builtin-kargs.cxx \
src/app/rpmostree-compose-builtin-tree.cxx \ src/app/rpmostree-compose-builtin-tree.cxx \
src/app/rpmostree-composeutil.cxx \ src/app/rpmostree-composeutil.cxx \
src/app/rpmostree-composeutil.h \ src/app/rpmostree-composeutil.h \

4
src/app/rpmostree-builtin-kargs.c → src/app/rpmostree-builtin-kargs.cxx
View File

@ -123,7 +123,7 @@ kernel_arg_handle_editor (const char *input_kernel_arg,
} }
/* Transfer the ownership to a new string, so we can remove the trailing spaces */ /* Transfer the ownership to a new string, so we can remove the trailing spaces */
g_autofree char *kernel_args_str = g_string_free (g_steal_pointer (&kernel_arg_buf), FALSE); g_autofree char *kernel_args_str = g_string_free (util::move_nullify (kernel_arg_buf), FALSE);
g_strchomp (kernel_args_str); g_strchomp (kernel_args_str);
g_autoptr(OstreeKernelArgs) input_kargs = ostree_kernel_args_from_string (kernel_args_str); g_autoptr(OstreeKernelArgs) input_kargs = ostree_kernel_args_from_string (kernel_args_str);
@ -152,7 +152,7 @@ kernel_arg_handle_editor (const char *input_kernel_arg,
return FALSE; return FALSE;
} }
*out_kernel_arg = g_steal_pointer (&kernel_args_str); *out_kernel_arg = util::move_nullify (kernel_args_str);
return TRUE; return TRUE;
} }