From d7fe9e54ed675aa7b82e59808a5ab1bac4b1c4a3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sun, 23 Jul 2023 10:26:30 -0400
Subject: [PATCH] kernel-args: Move private functions out of public header

External users can't call `_` prefixed APIs, so move them
to a `-private.h`.
---
 Makefile-libostree.am                      |  1 +
 src/libostree/ostree-kernel-args-private.h | 44 ++++++++++++++++++++++
 src/libostree/ostree-kernel-args.c         |  2 +-
 src/libostree/ostree-kernel-args.h         | 21 -----------
 tests/test-kargs.c                         |  2 +-
 5 files changed, 47 insertions(+), 23 deletions(-)
 create mode 100644 src/libostree/ostree-kernel-args-private.h

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 1cb7de54..265faa33 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -136,6 +136,7 @@ libostree_1_la_SOURCES = \
 	src/libostree/ostree-repo-finder-mount.c \
 	src/libostree/ostree-repo-finder-override.c \
 	src/libostree/ostree-kernel-args.h \
+	src/libostree/ostree-kernel-args-private.h \
 	src/libostree/ostree-kernel-args.c \
 	$(NULL)
 if USE_LIBARCHIVE
diff --git a/src/libostree/ostree-kernel-args-private.h b/src/libostree/ostree-kernel-args-private.h
new file mode 100644
index 00000000..967676bb
--- /dev/null
+++ b/src/libostree/ostree-kernel-args-private.h
@@ -0,0 +1,44 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2 of the licence or (at
+ * your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "ostree-kernel-args.h"
+
+G_BEGIN_DECLS
+
+typedef struct _OstreeKernelArgsEntry OstreeKernelArgsEntry;
+
+GHashTable *_ostree_kernel_arg_get_kargs_table (OstreeKernelArgs *kargs);
+
+GPtrArray *_ostree_kernel_arg_get_key_array (OstreeKernelArgs *kargs);
+
+char *_ostree_kernel_args_entry_get_key (const OstreeKernelArgsEntry *e);
+
+char *_ostree_kernel_args_entry_get_value (const OstreeKernelArgsEntry *e);
+
+void _ostree_kernel_args_entry_set_key (OstreeKernelArgsEntry *e, char *key);
+
+void _ostree_kernel_args_entry_set_value (OstreeKernelArgsEntry *e, char *value);
+
+char *_ostree_kernel_args_get_key_index (const OstreeKernelArgs *kargs, int i);
+
+char *_ostree_kernel_args_get_value_index (const OstreeKernelArgs *kargs, int i);
+
+OstreeKernelArgsEntry *_ostree_kernel_args_entry_new (void);
+
+void _ostree_kernel_args_entry_value_free (OstreeKernelArgsEntry *e);
+
+G_END_DECLS
diff --git a/src/libostree/ostree-kernel-args.c b/src/libostree/ostree-kernel-args.c
index d07c5ce4..9a9e0be2 100644
--- a/src/libostree/ostree-kernel-args.c
+++ b/src/libostree/ostree-kernel-args.c
@@ -18,7 +18,7 @@
 #include "config.h"
 
 #include "libglnx.h"
-#include "ostree-kernel-args.h"
+#include "ostree-kernel-args-private.h"
 #include "otutil.h"
 
 #include <string.h>
diff --git a/src/libostree/ostree-kernel-args.h b/src/libostree/ostree-kernel-args.h
index ea37de06..b39dafd2 100644
--- a/src/libostree/ostree-kernel-args.h
+++ b/src/libostree/ostree-kernel-args.h
@@ -25,27 +25,6 @@
 G_BEGIN_DECLS
 
 typedef struct _OstreeKernelArgs OstreeKernelArgs;
-typedef struct _OstreeKernelArgsEntry OstreeKernelArgsEntry;
-
-GHashTable *_ostree_kernel_arg_get_kargs_table (OstreeKernelArgs *kargs);
-
-GPtrArray *_ostree_kernel_arg_get_key_array (OstreeKernelArgs *kargs);
-
-char *_ostree_kernel_args_entry_get_key (const OstreeKernelArgsEntry *e);
-
-char *_ostree_kernel_args_entry_get_value (const OstreeKernelArgsEntry *e);
-
-void _ostree_kernel_args_entry_set_key (OstreeKernelArgsEntry *e, char *key);
-
-void _ostree_kernel_args_entry_set_value (OstreeKernelArgsEntry *e, char *value);
-
-char *_ostree_kernel_args_get_key_index (const OstreeKernelArgs *kargs, int i);
-
-char *_ostree_kernel_args_get_value_index (const OstreeKernelArgs *kargs, int i);
-
-OstreeKernelArgsEntry *_ostree_kernel_args_entry_new (void);
-
-void _ostree_kernel_args_entry_value_free (OstreeKernelArgsEntry *e);
 
 _OSTREE_PUBLIC
 void ostree_kernel_args_free (OstreeKernelArgs *kargs);
diff --git a/tests/test-kargs.c b/tests/test-kargs.c
index f233620c..bd1735d4 100644
--- a/tests/test-kargs.c
+++ b/tests/test-kargs.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "ostree-kernel-args.h"
+#include "ostree-kernel-args-private.h"
 #include "otutil.h"
 
 static gboolean