Rename `BT_RANGE_SET_` to `BT_INTEGER_RANGE_SET_`

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ibf20111c88f4a980d858cecd297bf6285cbbb4ee
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2310
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>

diff --git a/include/babeltrace2/integer-range-set-const.h b/include/babeltrace2/integer-range-set-const.h
index d762de06c1fe2b2ec434d1ab8715f3cf65a29b16..cbf9f33a9449c9ed9f77d666c8590ce888f4d231 100644 (file)
--- a/include/babeltrace2/integer-range-set-const.h
+++ b/include/babeltrace2/integer-range-set-const.h
@@ -94,13 +94,13 @@ extern void bt_integer_range_set_unsigned_get_ref(
 extern void bt_integer_range_set_unsigned_put_ref(
                const bt_integer_range_set_unsigned *range_set);
 
-#define BT_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(_var)                  \
+#define BT_INTEGER_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(_var)          \
        do {                                                            \
                bt_integer_range_set_unsigned_put_ref(_var);            \
                (_var) = NULL;                                          \
        } while (0)
 
-#define BT_RANGE_SET_UNSIGNED_MOVE_REF(_var_dst, _var_src)             \
+#define BT_INTEGER_RANGE_SET_UNSIGNED_MOVE_REF(_var_dst, _var_src)     \
        do {                                                            \
                bt_integer_range_set_unsigned_put_ref(_var_dst);        \
                (_var_dst) = (_var_src);                                \
@@ -113,13 +113,13 @@ extern void bt_integer_range_set_signed_get_ref(
 extern void bt_integer_range_set_signed_put_ref(
                const bt_integer_range_set_signed *range_set);
 
-#define BT_RANGE_SET_SIGNED_PUT_REF_AND_RESET(_var)                    \
+#define BT_INTEGER_RANGE_SET_SIGNED_PUT_REF_AND_RESET(_var)            \
        do {                                                            \
                bt_integer_range_set_signed_put_ref(_var);              \
                (_var) = NULL;                                          \
        } while (0)
 
-#define BT_RANGE_SET_SIGNED_MOVE_REF(_var_dst, _var_src)               \
+#define BT_INTEGER_RANGE_SET_SIGNED_MOVE_REF(_var_dst, _var_src)       \
        do {                                                            \
                bt_integer_range_set_signed_put_ref(_var_dst);          \
                (_var_dst) = (_var_src);                                \

diff --git a/include/babeltrace2/integer-range-set.h b/include/babeltrace2/integer-range-set.h
index 6d5b0ec8633a39bb92c475aa4efda768cb2075b0..f1d9a56c780eec2b93f75592d6af0f9c1228f5a4 100644 (file)
--- a/include/babeltrace2/integer-range-set.h
+++ b/include/babeltrace2/integer-range-set.h
@@ -40,8 +40,8 @@ extern "C" {
 extern bt_integer_range_set_unsigned *bt_integer_range_set_unsigned_create(void);
 
 typedef enum bt_integer_range_set_add_range_status {
-       BT_RANGE_SET_ADD_RANGE_STATUS_MEMORY_ERROR      = __BT_FUNC_STATUS_MEMORY_ERROR,
-       BT_RANGE_SET_ADD_RANGE_STATUS_OK                = __BT_FUNC_STATUS_OK,
+       BT_INTEGER_RANGE_SET_ADD_RANGE_STATUS_MEMORY_ERROR  = __BT_FUNC_STATUS_MEMORY_ERROR,
+       BT_INTEGER_RANGE_SET_ADD_RANGE_STATUS_OK            = __BT_FUNC_STATUS_OK,
 } bt_integer_range_set_add_range_status;
 
 extern bt_integer_range_set_add_range_status bt_integer_range_set_unsigned_add_range(

diff --git a/src/plugins/ctf/common/metadata/ctf-meta-translate.c b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
index 50b39e3a46399034ea17075c60f42e3c7a515c5c..1ac7aac311737f47db692275da19ec3ec867e954 100644 (file)
--- a/src/plugins/ctf/common/metadata/ctf-meta-translate.c
+++ b/src/plugins/ctf/common/metadata/ctf-meta-translate.c
@@ -116,11 +116,11 @@ bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx,
                if (fc->base.is_signed) {
                        ret = bt_field_class_enumeration_signed_add_mapping(
                                ir_fc, mapping->label->str, range_set);
-                       BT_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
+                       BT_INTEGER_RANGE_SET_SIGNED_PUT_REF_AND_RESET(range_set);
                } else {
                        ret = bt_field_class_enumeration_unsigned_add_mapping(
                                ir_fc, mapping->label->str, range_set);
-                       BT_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
+                       BT_INTEGER_RANGE_SET_UNSIGNED_PUT_REF_AND_RESET(range_set);
                }
 
                BT_ASSERT(ret == 0);