From 84b66b7aaa908fa5dc3dfacf0237662c54fbc690 Mon Sep 17 00:00:00 2001 From: Danny Browning Date: Fri, 1 Dec 2017 11:23:30 -0700 Subject: [PATCH] enum: don't printf on util-enum errors When util-enum encounters an error around enum value it should log the error rather than losing it to console with printf. Bug #2268 --- src/util-enum.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util-enum.c b/src/util-enum.c index 97ee86f9b8..f6c3291050 100644 --- a/src/util-enum.c +++ b/src/util-enum.c @@ -25,6 +25,7 @@ #include #include "util-enum.h" +#include "util-debug.h" /** * \brief Maps a string name to an enum value from the supplied table. Please @@ -42,7 +43,7 @@ int SCMapEnumNameToValue(const char *enum_name, SCEnumCharMap *table) int result = -1; if (enum_name == NULL || table == NULL) { - printf("Invalid argument(s) passed into SCMapEnumNameToValue\n"); + SCLogDebug("Invalid argument(s) passed into SCMapEnumNameToValue"); return -1; } @@ -68,7 +69,7 @@ int SCMapEnumNameToValue(const char *enum_name, SCEnumCharMap *table) const char * SCMapEnumValueToName(int enum_value, SCEnumCharMap *table) { if (table == NULL) { - printf("Invalid argument(s) passed into SCMapEnumValueToName\n"); + SCLogDebug("Invalid argument(s) passed into SCMapEnumValueToName"); return NULL; } @@ -78,7 +79,7 @@ const char * SCMapEnumValueToName(int enum_value, SCEnumCharMap *table) } } - printf("A enum by the value %d doesn't exist in this table\n", enum_value); + SCLogDebug("A enum by the value %d doesn't exist in this table", enum_value); return NULL; } -- 2.47.2