kernel-args: Move private functions out of public header

External users can't call `_` prefixed APIs, so move them
to a `-private.h`.

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 1cb7de54774df4f481ef97b6f1a3542a513177da..265faa33b90f72999bd90b3e55cb0c285c32eff3 100644 (file)
--- 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 (file)
index 0000000..967676b
--- /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 d07c5ce4291aa98bb1ce6a5db9b36bfeec675fc0..9a9e0be24878181ffc5c0c484d1ed9f1056f44f3 100644 (file)
--- 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 ea37de06a2aae7de71b94fb39078b2ced5175aa6..b39dafd242674342280523bff86bcd7fb1da70f6 100644 (file)
--- 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 f233620c9f863809e8686521acc86e1b973592ab..bd1735d4b8af03e8577742730a07a405992cf4dc 100644 (file)
--- 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