lib: move `bt_value` structures to `value-internal.h`

It's unusual to have internal structures in the C file. To remain
consistent with the rest of the library, put them in the internal
header.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5a946004a172560acecab1b182214293f61f02fd
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1255
CI-Build: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Tested-by: jenkins

diff --git a/include/babeltrace/value-internal.h b/include/babeltrace/value-internal.h
index b4368f56f6aa4bf084caa5a0de61bd83b7c101f3..dd3fb7d9fae321ca39ac086043346ef3c635ecb4 100644 (file)
--- a/include/babeltrace/value-internal.h
+++ b/include/babeltrace/value-internal.h
@@ -23,8 +23,47 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/object-internal.h>
 #include <babeltrace/value.h>
 #include <babeltrace/value-const.h>
+#include <babeltrace/types.h>
+#include <glib.h>
+
+struct bt_value {
+       struct bt_object base;
+       enum bt_value_type type;
+       bt_bool frozen;
+};
+
+struct bt_value_bool {
+       struct bt_value base;
+       bt_bool value;
+};
+
+struct bt_value_integer {
+       struct bt_value base;
+       int64_t value;
+};
+
+struct bt_value_real {
+       struct bt_value base;
+       double value;
+};
+
+struct bt_value_string {
+       struct bt_value base;
+       GString *gstr;
+};
+
+struct bt_value_array {
+       struct bt_value base;
+       GPtrArray *garray;
+};
+
+struct bt_value_map {
+       struct bt_value base;
+       GHashTable *ght;
+};
 
 BT_HIDDEN
 enum bt_value_status _bt_value_freeze(const struct bt_value *object);

diff --git a/lib/value.c b/lib/value.c
index 83168e74fe9cd99c22922342a219684865a31feb..07985ea84b7cbbe9d428407d571553fbaf2a51f0 100644 (file)
--- a/lib/value.c
+++ b/lib/value.c
@@ -34,7 +34,6 @@
 #include <babeltrace/compat/glib-internal.h>
 #include <babeltrace/types.h>
 #include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/object-internal.h>
 #include <babeltrace/value-internal.h>
 #include <babeltrace/assert-internal.h>
 
@@ -61,12 +60,6 @@
                "Index is out of bound: "                               \
                "index=%" PRIu64 ", count=%u", (_index), (_count));
 
-struct bt_value {
-       struct bt_object base;
-       enum bt_value_type type;
-       bt_bool frozen;
-};
-
 static
 void bt_value_null_instance_release_func(struct bt_object *obj)
 {
@@ -89,36 +82,6 @@ struct bt_value bt_value_null_instance = {
 
 struct bt_value *const bt_value_null = &bt_value_null_instance;
 
-struct bt_value_bool {
-       struct bt_value base;
-       bt_bool value;
-};
-
-struct bt_value_integer {
-       struct bt_value base;
-       int64_t value;
-};
-
-struct bt_value_real {
-       struct bt_value base;
-       double value;
-};
-
-struct bt_value_string {
-       struct bt_value base;
-       GString *gstr;
-};
-
-struct bt_value_array {
-       struct bt_value base;
-       GPtrArray *garray;
-};
-
-struct bt_value_map {
-       struct bt_value base;
-       GHashTable *ght;
-};
-
 static
 void bt_value_destroy(struct bt_object *obj);