Remove bt_ctf_field_type_enumeration_get_mapping_name

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/field-types.c b/formats/ctf/ir/field-types.c
index 043df078464f5eb41d3bcec5b4f367c42b4546d7..9e06840d4bda7dedfb6da2b2bf84609fc84cb861 100644 (file)
--- a/formats/ctf/ir/field-types.c
+++ b/formats/ctf/ir/field-types.c
@@ -632,6 +632,33 @@ bool bt_ctf_field_type_enumeration_has_overlapping_ranges(
        return enumeration_type->has_overlapping_ranges;
 }
 
+static
+int bt_ctf_field_type_enumeration_get_mapping_name(
+               struct bt_ctf_field_type *enum_field_type,
+               int index,
+               const char **mapping_name)
+{
+       int ret = 0;
+       struct enumeration_mapping *mapping;
+
+       if (!enum_field_type || index < 0) {
+               ret = -1;
+               goto end;
+       }
+
+       mapping = get_enumeration_mapping(enum_field_type, index);
+       if (!mapping) {
+               ret = -1;
+               goto end;
+       }
+
+       if (mapping_name) {
+               *mapping_name = g_quark_to_string(mapping->string);
+       }
+end:
+       return ret;
+}
+
 static
 int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *type)
 {
@@ -1119,32 +1146,6 @@ error:
        return NULL;
 }
 
-int bt_ctf_field_type_enumeration_get_mapping_name(
-               struct bt_ctf_field_type *enum_field_type,
-               int index,
-               const char **mapping_name)
-{
-       int ret = 0;
-       struct enumeration_mapping *mapping;
-
-       if (!enum_field_type || index < 0) {
-               ret = -1;
-               goto end;
-       }
-
-       mapping = get_enumeration_mapping(enum_field_type, index);
-       if (!mapping) {
-               ret = -1;
-               goto end;
-       }
-
-       if (mapping_name) {
-               *mapping_name = g_quark_to_string(mapping->string);
-       }
-end:
-       return ret;
-}
-
 int bt_ctf_field_type_enumeration_mapping_iterator_get_name(
                struct bt_ctf_field_type_enumeration_mapping_iterator *iter,
                const char **mapping_name)

diff --git a/include/babeltrace/ctf-ir/field-types.h b/include/babeltrace/ctf-ir/field-types.h
index 7ae3ae55bbd3506392bd70dd90da09901bb67971..e9b5f25393bbd9e2eeeb4ef6deb070934fcf5cc2 100644 (file)
--- a/include/babeltrace/ctf-ir/field-types.h
+++ b/include/babeltrace/ctf-ir/field-types.h
@@ -1316,10 +1316,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_get_container_type(
 extern int bt_ctf_field_type_enumeration_get_mapping_count(
                struct bt_ctf_field_type *enum_field_type);
 
-extern int bt_ctf_field_type_enumeration_get_mapping_name(
-               struct bt_ctf_field_type *enum_field_type, int index,
-               const char **name);
-
 /**
 @brief Returns the signed mapping of the @enumft
        \p enum_field_type at index \p index.