shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Idempotent delete operation for OstreeKernelArgs

Browse Source 
ostree_kernel_args_delete_if_present checks if an argument is present
in OstreeKernelArgs and delete it.

Signed-off-by: Rafael Garcia Ruiz <rafael.garcia@collabora.com>
This commit is contained in:
Rafael Garcia Ruiz 2022-11-18 18:24:01 +01:00
parent a34e28ebd0
commit f6d308f130
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apidoc/ostree-sections.txt
View File

@ -739,6 +739,7 @@ ostree_kernel_args_from_string
ostree_kernel_args_to_strv ostree_kernel_args_to_strv
ostree_kernel_args_to_string ostree_kernel_args_to_string
ostree_kernel_args_contains ostree_kernel_args_contains
ostree_kernel_args_delete_if_present
</SECTION> </SECTION>
<SECTION> <SECTION>

7
rust-bindings/sys/src/lib.rs
View File

@ -1319,6 +1319,13 @@ extern "C" {
kargs: *mut OstreeKernelArgs, kargs: *mut OstreeKernelArgs,
arg: *const c_char, arg: *const c_char,
) -> gboolean; ) -> gboolean;
#[cfg(any(feature = "v2022_7", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2022_7")))]
pub fn ostree_kernel_args_delete_if_present(
kargs: *mut OstreeKernelArgs,
arg: *const c_char,
error: *mut *mut glib::GError,
) -> gboolean;
#[cfg(any(feature = "v2019_3", feature = "dox"))] #[cfg(any(feature = "v2019_3", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v2019_3")))]
pub fn ostree_kernel_args_append_proc_cmdline( pub fn ostree_kernel_args_append_proc_cmdline(

1
src/libostree/libostree-devel.sym
View File

@ -23,6 +23,7 @@
LIBOSTREE_2022.7 { LIBOSTREE_2022.7 {
global: global:
ostree_kernel_args_contains; ostree_kernel_args_contains;
ostree_kernel_args_delete_if_present;
} LIBOSTREE_2022.5; } LIBOSTREE_2022.5;
/* Stub section for the stable release *after* this development one; don't /* Stub section for the stable release *after* this development one; don't

22
src/libostree/ostree-kernel-args.c
View File

@ -848,3 +848,25 @@ ostree_kernel_args_contains (OstreeKernelArgs *kargs,
return g_hash_table_contains (kargs->table, key); return g_hash_table_contains (kargs->table, key);
} }
/**
* ostree_kernel_args_delete_if_present:
* @kargs: a OstreeKernelArgs instance
* @arg: key or key/value pair to be deleted
* @error: an GError instance
*
* Deletes @arg which is in the form of key=value pair from the hash table kargs->table.
*
* Returns: %TRUE on success, %FALSE on failure
*
* Since: 2022.7
**/
gboolean
ostree_kernel_args_delete_if_present (OstreeKernelArgs *kargs,
const char *arg,
GError **error)
{
if (ostree_kernel_args_contains (kargs, arg))
return ostree_kernel_args_delete (kargs, arg, error);
return TRUE;
}

4
src/libostree/ostree-kernel-args.h
View File

@ -138,4 +138,8 @@ _OSTREE_PUBLIC
gboolean ostree_kernel_args_contains (OstreeKernelArgs *kargs, gboolean ostree_kernel_args_contains (OstreeKernelArgs *kargs,
const char *arg); const char *arg);
_OSTREE_PUBLIC
gboolean ostree_kernel_args_delete_if_present (OstreeKernelArgs *kargs,
const char *arg,
GError **error);
G_END_DECLS G_END_DECLS