From 520cdc8260ea033f1c9f54b87d93fcb034ae8472 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 24 Jul 2019 14:48:05 -0400 Subject: [PATCH] lib: rename all `*_STATUS_OVERFLOW` -> `*_STATUS_OVERFLOW_ERROR` All the error statuses must have the `_ERROR` suffix. Signed-off-by: Philippe Proulx Change-Id: I2243c77ecb9723f3c97f7f9f9af09df646d48ae3 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1770 Tested-by: jenkins --- include/babeltrace2/babeltrace.h | 2 +- include/babeltrace2/func-status.h | 4 ++-- include/babeltrace2/trace-ir/clock-class-const.h | 2 +- include/babeltrace2/trace-ir/clock-snapshot-const.h | 4 ++-- include/babeltrace2/util.h | 2 +- src/bindings/python/bt2/bt2/utils.py | 2 +- src/common/common.h | 2 +- src/lib/func-status.h | 2 +- src/lib/trace-ir/clock-class.c | 2 +- src/lib/trace-ir/clock-class.h | 2 +- src/lib/trace-ir/clock-snapshot.c | 2 +- src/lib/util.c | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h index ded1b03f..3b7bb753 100644 --- a/include/babeltrace2/babeltrace.h +++ b/include/babeltrace2/babeltrace.h @@ -165,7 +165,7 @@ #undef __BT_FUNC_STATUS_MEMORY_ERROR #undef __BT_FUNC_STATUS_NOT_FOUND #undef __BT_FUNC_STATUS_OK -#undef __BT_FUNC_STATUS_OVERFLOW +#undef __BT_FUNC_STATUS_OVERFLOW_ERROR #undef __BT_IN_BABELTRACE_H #undef __BT_UPCAST #undef __BT_UPCAST_CONST diff --git a/include/babeltrace2/func-status.h b/include/babeltrace2/func-status.h index 74fc1012..4f8e61a9 100644 --- a/include/babeltrace2/func-status.h +++ b/include/babeltrace2/func-status.h @@ -37,8 +37,8 @@ */ /* Value is too large for the given data type */ -#ifndef __BT_FUNC_STATUS_OVERFLOW -# define __BT_FUNC_STATUS_OVERFLOW -75 +#ifndef __BT_FUNC_STATUS_OVERFLOW_ERROR +# define __BT_FUNC_STATUS_OVERFLOW_ERROR -75 #endif /* Invalid query object */ diff --git a/include/babeltrace2/trace-ir/clock-class-const.h b/include/babeltrace2/trace-ir/clock-class-const.h index 47635cee..b4affd53 100644 --- a/include/babeltrace2/trace-ir/clock-class-const.h +++ b/include/babeltrace2/trace-ir/clock-class-const.h @@ -57,7 +57,7 @@ extern bt_uuid bt_clock_class_get_uuid( const bt_clock_class *clock_class); typedef enum bt_clock_class_cycles_to_ns_from_origin_status { - BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OVERFLOW = __BT_FUNC_STATUS_OVERFLOW, + BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OVERFLOW_ERROR = __BT_FUNC_STATUS_OVERFLOW_ERROR, BT_CLOCK_CLASS_CYCLES_TO_NS_FROM_ORIGIN_STATUS_OK = __BT_FUNC_STATUS_OK, } bt_clock_class_cycles_to_ns_from_origin_status; diff --git a/include/babeltrace2/trace-ir/clock-snapshot-const.h b/include/babeltrace2/trace-ir/clock-snapshot-const.h index 14741444..3363b9df 100644 --- a/include/babeltrace2/trace-ir/clock-snapshot-const.h +++ b/include/babeltrace2/trace-ir/clock-snapshot-const.h @@ -42,8 +42,8 @@ extern uint64_t bt_clock_snapshot_get_value( const bt_clock_snapshot *clock_snapshot); typedef enum bt_clock_snapshot_get_ns_from_origin_status { - BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OK = __BT_FUNC_STATUS_OK, - BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OVERFLOW = __BT_FUNC_STATUS_OVERFLOW, + BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OK = __BT_FUNC_STATUS_OK, + BT_CLOCK_SNAPSHOT_GET_NS_FROM_ORIGIN_STATUS_OVERFLOW_ERROR = __BT_FUNC_STATUS_OVERFLOW_ERROR, } bt_clock_snapshot_get_ns_from_origin_status; extern bt_clock_snapshot_get_ns_from_origin_status diff --git a/include/babeltrace2/util.h b/include/babeltrace2/util.h index 0650d603..8d9585c3 100644 --- a/include/babeltrace2/util.h +++ b/include/babeltrace2/util.h @@ -35,7 +35,7 @@ extern "C" { typedef enum bt_util_status { BT_UTIL_STATUS_OK = 0, - BT_UTIL_STATUS_OVERFLOW = -75, + BT_UTIL_STATUS_OVERFLOW_ERROR = -75, } bt_util_status; bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py index abb9accf..9c884175 100644 --- a/src/bindings/python/bt2/bt2/utils.py +++ b/src/bindings/python/bt2/bt2/utils.py @@ -151,7 +151,7 @@ def _handle_func_status(status, msg=None): raise bt2.TryAgain else: raise bt2.TryAgain(msg) - elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW: + elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR: if msg is None: raise bt2.OverflowError else: diff --git a/src/common/common.h b/src/common/common.h index 3d5c0b5e..8c74579b 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -601,7 +601,7 @@ static inline const char *bt_common_func_status_string(int status) { switch (status) { - case __BT_FUNC_STATUS_OVERFLOW: + case __BT_FUNC_STATUS_OVERFLOW_ERROR: return "OVERFLOW"; case __BT_FUNC_STATUS_INVALID_OBJECT: return "INVALID_OBJECT"; diff --git a/src/lib/func-status.h b/src/lib/func-status.h index 25520ffa..e5aca4aa 100644 --- a/src/lib/func-status.h +++ b/src/lib/func-status.h @@ -38,6 +38,6 @@ #define BT_FUNC_STATUS_MEMORY_ERROR __BT_FUNC_STATUS_MEMORY_ERROR #define BT_FUNC_STATUS_NOT_FOUND __BT_FUNC_STATUS_NOT_FOUND #define BT_FUNC_STATUS_OK __BT_FUNC_STATUS_OK -#define BT_FUNC_STATUS_OVERFLOW __BT_FUNC_STATUS_OVERFLOW +#define BT_FUNC_STATUS_OVERFLOW_ERROR __BT_FUNC_STATUS_OVERFLOW_ERROR #endif /* BABELTRACE_FUNC_STATUS_INTERNAL_H */ diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c index fb0d108c..34e3a87b 100644 --- a/src/lib/trace-ir/clock-class.c +++ b/src/lib/trace-ir/clock-class.c @@ -296,7 +296,7 @@ bt_clock_class_cycles_to_ns_from_origin( "value overflows the signed 64-bit integer range: " "%![cc-]+K, cycles=%" PRIu64, clock_class, cycles); - ret = BT_FUNC_STATUS_OVERFLOW; + ret = BT_FUNC_STATUS_OVERFLOW_ERROR; } return ret; diff --git a/src/lib/trace-ir/clock-class.h b/src/lib/trace-ir/clock-class.h index f3daa67c..b39183c2 100644 --- a/src/lib/trace-ir/clock-class.h +++ b/src/lib/trace-ir/clock-class.h @@ -115,7 +115,7 @@ int bt_clock_class_clock_value_from_ns_from_origin( return bt_common_clock_value_from_ns_from_origin(cc->offset_seconds, cc->offset_cycles, cc->frequency, ns_from_origin, - raw_value) ? BT_FUNC_STATUS_OVERFLOW : BT_FUNC_STATUS_OK; + raw_value) ? BT_FUNC_STATUS_OVERFLOW_ERROR : BT_FUNC_STATUS_OK; } #endif /* BABELTRACE_TRACE_IR_CLOCK_CLASS_INTERNAL_H */ diff --git a/src/lib/trace-ir/clock-snapshot.c b/src/lib/trace-ir/clock-snapshot.c index e418fff6..899d0083 100644 --- a/src/lib/trace-ir/clock-snapshot.c +++ b/src/lib/trace-ir/clock-snapshot.c @@ -167,7 +167,7 @@ bt_clock_snapshot_get_ns_from_origin( "Clock snapshot, once converted to nanoseconds from origin, " "overflows the signed 64-bit integer range: " "%![cs-]+k", clock_snapshot); - ret = BT_FUNC_STATUS_OVERFLOW; + ret = BT_FUNC_STATUS_OVERFLOW_ERROR; goto end; } diff --git a/src/lib/util.c b/src/lib/util.c index a52daf9a..d6b90537 100644 --- a/src/lib/util.c +++ b/src/lib/util.c @@ -51,7 +51,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, overflows = bt_util_get_base_offset_ns(offset_seconds, offset_cycles, frequency, &base_offset_ns); if (overflows) { - status = BT_UTIL_STATUS_OVERFLOW; + status = BT_UTIL_STATUS_OVERFLOW_ERROR; goto end; } @@ -59,7 +59,7 @@ bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, offset_seconds, offset_cycles, frequency, cycles, ns); if (ret) { - status = BT_UTIL_STATUS_OVERFLOW; + status = BT_UTIL_STATUS_OVERFLOW_ERROR; } end: -- 2.34.1