Cleanup: ust-abi: BITNESS_{32,64}BITS -> BITNESS_{32,64}

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I5175116ec93d61fe55d1c17e2e2b99b02a0e73a9

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 455b0a4cecbbbef49c9784a2da4f4159d1da0ccd..b1cd9b3d2a310f7f578e33e041cea4745ed80c0a 100644 (file)
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -110,8 +110,8 @@ enum lttng_ust_counter_arithmetic {
 };
 
 enum lttng_ust_counter_bitness {
-       LTTNG_UST_COUNTER_BITNESS_32BITS = 4,
-       LTTNG_UST_COUNTER_BITNESS_64BITS = 8,
+       LTTNG_UST_COUNTER_BITNESS_32 = 4,
+       LTTNG_UST_COUNTER_BITNESS_64 = 8,
 };
 
 struct lttng_ust_counter_dimension {

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 8460dbf4f654ab06fc2954405b48ab6f6fb024bf..7d2c05a9a9edb7002bbc28aae4daa9f3767945aa 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -2579,10 +2579,10 @@ int ustctl_create_counter_data(struct ustctl_daemon_counter *counter,
        }
        switch (counter->attr->bitness) {
        case USTCTL_COUNTER_BITNESS_32:
-               counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_32BITS;
+               counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_32;
                break;
        case USTCTL_COUNTER_BITNESS_64:
-               counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_64BITS;
+               counter_conf.bitness = LTTNG_UST_COUNTER_BITNESS_64;
                break;
        default:
                return -EINVAL;

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index aad64a6dd326dbd13b01332c07d0bde8326b837c..b35065996815a1cc3c8fd56aac47a6f6471018e6 100644 (file)
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -816,10 +816,10 @@ int lttng_ust_event_notifier_group_create_error_counter(int event_notifier_group
                return -EINVAL;
 
        switch (error_counter_conf->bitness) {
-       case LTTNG_UST_COUNTER_BITNESS_64BITS:
+       case LTTNG_UST_COUNTER_BITNESS_64:
                counter_transport_name = "counter-per-cpu-64-modular";
                break;
-       case LTTNG_UST_COUNTER_BITNESS_32BITS:
+       case LTTNG_UST_COUNTER_BITNESS_32:
                counter_transport_name = "counter-per-cpu-32-modular";
                break;
        default: