sysroot: Reword comment and use gboolean over bool

Be more explicit in the comment and use gboolean over bool. Less header inclusions when we use gboolean. Although bool is used in some places. Co-authored-by: Jonathan Lebon <[email protected]> Signed-off-by: Eric Curtin <[email protected]>
ostreedev · Feb 22, 2024 · 1c0943c · 1c0943c
1 parent e790e79
commit 1c0943c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/libostree/ostree-impl-system-generator.c b/src/libostree/ostree-impl-system-generator.c
@@ -264,8 +264,9 @@ _ostree_impl_system_generator (const char *normal_dir, const char *early_dir, co
 
   g_autoptr (GError) otcore_get_ostree_target_error = NULL;
   g_autofree char *ostree_target = NULL;
-  bool is_aboot = false;
-  /* This could happen in CoreOS live environments, where we hackily mock
+  gboolean is_aboot = false;
+  /* If no `ostree=` karg exists, gracefully no-op.
+   * This could happen in CoreOS live environments, where we hackily mock
    * the `ostree=` karg for `ostree-prepare-root.service` specifically, but
    * otherwise that karg doesn't exist on the real command-line. */
   if (!otcore_get_ostree_target (cmdline, &is_aboot, &ostree_target,

diff --git a/src/libostree/ostree-sysroot-private.h b/src/libostree/ostree-sysroot-private.h
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <stdbool.h>
-
 #include "libglnx.h"
 #include "ostree-bootloader.h"
 #include "ostree.h"
@@ -179,7 +177,7 @@ gboolean _ostree_sysroot_parse_bootdir_name (const char *name, char **out_osname
 gboolean _ostree_sysroot_list_all_boot_directories (OstreeSysroot *self, char ***out_bootdirs,
                                                     GCancellable *cancellable, GError **error);
 
-gboolean _ostree_sysroot_parse_bootlink (const char *bootlink, const bool is_aboot,
+gboolean _ostree_sysroot_parse_bootlink (const char *bootlink, const gboolean is_aboot,
                                          int *out_entry_bootversion, char **out_osname,
                                          char **out_bootcsum, int *out_treebootserial,
                                          GError **error);

diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
@@ -724,7 +724,7 @@ load_origin (OstreeSysroot *self, OstreeDeployment *deployment, GCancellable *ca
 
 // Parse the kernel argument ostree=
 gboolean
-_ostree_sysroot_parse_bootlink (const char *bootlink, const bool is_aboot,
+_ostree_sysroot_parse_bootlink (const char *bootlink, const gboolean is_aboot,
                                 int *out_entry_bootversion, char **out_osname, char **out_bootcsum,
                                 int *out_treebootserial, GError **error)
 {