From: Danny Browning <danny.browning@protectwise.com>
Date: Fri, 1 Dec 2017 18:23:30 +0000 (-0700)
Subject: enum: don't printf on util-enum errors
X-Git-Tag: suricata-4.1.0-beta1~517
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3044%2Fhead;p=thirdparty%2Fsuricata.git

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
---

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 <string.h>
 
 #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;
 }