X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Floglevel.c;h=ec82bfe11aeb85f278ea2d549eb302c0733b8f83;hb=00608d5a443138047155a1ac61b9cd64a598e839;hp=e59c248131b2cc57885ff6be50eb63b4da1467e1;hpb=7e8f2e9cce651c81094a864bbffefcaa4bcc7a51;p=lttng-tools.git

diff --git a/src/bin/lttng/loglevel.c b/src/bin/lttng/loglevel.c
index e59c24813..ec82bfe11 100644
--- a/src/bin/lttng/loglevel.c
+++ b/src/bin/lttng/loglevel.c
@@ -7,11 +7,10 @@
 
 #include "loglevel.h"
 #include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include <assert.h>
 
-#define LOGLEVEL_NAME_VALUE_ARRAY_COUNT(name) (sizeof(name) / sizeof(struct loglevel_name_value))
-
 struct loglevel_name_value {
 	const char *name;
 	int value;
@@ -119,25 +118,7 @@ const struct loglevel_name_value loglevel_python_values[] = {
 static
 bool string_equal_insensitive(const char *a, const char *b)
 {
-	bool result;
-
-	assert(a && b);
-
-	while (*a && *b) {
-		if (toupper(*a) != toupper(*b)) {
-			result = false;
-			goto end;
-		}
-
-		a++;
-		b++;
-	}
-
-	/* If a and b don't have the same length, consider them unequal. */
-	result = *a == *b;
-
-end:
-	return result;
+	return strcasecmp(a, b) == 0;
 }
 
 static
@@ -167,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;
@@ -182,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) {
@@ -198,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) {
@@ -214,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) {
@@ -223,4 +204,4 @@ int loglevel_python_name_to_value(
 	}
 
 	return ret;
-}
\ No newline at end of file
+}