From 00608d5a443138047155a1ac61b9cd64a598e839 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 16 Feb 2021 15:47:28 -0500 Subject: [PATCH] Clean-up: lttng: logging: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau Change-Id: Id53ebe9e88bcb78c8f45fbfb38b577686aacd004 --- src/bin/lttng/loglevel.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bin/lttng/loglevel.c b/src/bin/lttng/loglevel.c index 9f65df006..ec82bfe11 100644 --- a/src/bin/lttng/loglevel.c +++ b/src/bin/lttng/loglevel.c @@ -11,8 +11,6 @@ #include #include -#define LOGLEVEL_NAME_VALUE_ARRAY_COUNT(name) (sizeof(name) / sizeof(struct loglevel_name_value)) - struct loglevel_name_value { const char *name; int value; @@ -150,7 +148,7 @@ LTTNG_HIDDEN int loglevel_name_to_value(const char *name, enum lttng_loglevel *loglevel) { int ret = lookup_value_from_name(loglevel_values, - LOGLEVEL_NAME_VALUE_ARRAY_COUNT(loglevel_values), name); + ARRAY_SIZE(loglevel_values), name); if (ret >= 0) { *loglevel = (typeof(*loglevel)) ret; @@ -165,7 +163,7 @@ int loglevel_log4j_name_to_value( const char *name, enum lttng_loglevel_log4j *loglevel) { int ret = lookup_value_from_name(loglevel_log4j_values, - LOGLEVEL_NAME_VALUE_ARRAY_COUNT(loglevel_log4j_values), + ARRAY_SIZE(loglevel_log4j_values), name); if (ret >= 0) { @@ -181,7 +179,7 @@ int loglevel_jul_name_to_value( const char *name, enum lttng_loglevel_jul *loglevel) { int ret = lookup_value_from_name(loglevel_jul_values, - LOGLEVEL_NAME_VALUE_ARRAY_COUNT(loglevel_jul_values), + ARRAY_SIZE(loglevel_jul_values), name); if (ret >= 0) { @@ -197,7 +195,7 @@ int loglevel_python_name_to_value( const char *name, enum lttng_loglevel_python *loglevel) { int ret = lookup_value_from_name(loglevel_python_values, - LOGLEVEL_NAME_VALUE_ARRAY_COUNT(loglevel_python_values), + ARRAY_SIZE(loglevel_python_values), name); if (ret >= 0) { @@ -206,4 +204,4 @@ int loglevel_python_name_to_value( } return ret; -} \ No newline at end of file +} -- 2.34.1