proper fix of 9a20bf3

pbiering · Dec 29, 2016 · 785c333 · 785c333
1 parent 4ebc1cb
commit 785c333
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ipv6loganon/ipv6loganon.c b/ipv6loganon/ipv6loganon.c
@@ -400,7 +400,7 @@ static void lineparser(void) {
  * Anonymize token
  */
 static int anonymizetoken(char *resultstring, const size_t resultstring_length, const char *token) {
-	long int inputtype = -1;
+	uint32_t inputtype = FORMAT_undefined;
 	int retval = 1, i;
 
 	/* used structures */
@@ -462,9 +462,9 @@ static int anonymizetoken(char *resultstring, const size_t resultstring_length,
 	inputtype = libipv6calc_autodetectinput(token);
 
 	DEBUGSECTION_BEGIN(DEBUG_ipv6loganon_general)
-		if (inputtype >= 0) {
+		if (inputtype != FORMAT_undefined) {
 			for (i = 0; i < MAXENTRIES_ARRAY(ipv6calc_formatstrings); i++) {
-				if ((uint32_t) inputtype == ipv6calc_formatstrings[i].number) {
+				if (inputtype == ipv6calc_formatstrings[i].number) {
 					DEBUGPRINT_WA(DEBUG_ipv6loganon_general, "Found type: %s", ipv6calc_formatstrings[i].token);
 				};
 				break;

diff --git a/ipv6logconv/ipv6logconv.c b/ipv6logconv/ipv6logconv.c
@@ -395,7 +395,7 @@ static void lineparser(const long int outputtype) {
  * Convert token
  */
 static int converttoken(char *resultstring, const size_t resultstring_length, const char *token, const long int outputtype, const int flag_skipunknown) {
-	long int inputtype = -1;
+	uint32_t inputtype = FORMAT_undefined;
 	int retval = 1, i, registry;
 	uint32_t typeinfo, typeinfo_test;
 	char tempstring[NI_MAXHOST];
@@ -465,9 +465,9 @@ static int converttoken(char *resultstring, const size_t resultstring_length, co
 	inputtype = libipv6calc_autodetectinput(token);
 
 	DEBUGSECTION_BEGIN(DEBUG_ipv6logconv_processing)
-		if (inputtype >= 0) {
+		if (inputtype != FORMAT_undefined) {
 			for (i = 0; i < MAXENTRIES_ARRAY(ipv6calc_formatstrings); i++) {
-				if ((uint32_t) inputtype == ipv6calc_formatstrings[i].number) {
+				if (inputtype == ipv6calc_formatstrings[i].number) {
 					DEBUGPRINT_WA(DEBUG_ipv6logconv_processing, "Found type: %s", ipv6calc_formatstrings[i].token);
 				};
 				break;