Merge pull request #1155 from jan-cerny/more_warnings

Fix some warnings in maint-1.2

Author: cipherboy

src/OVAL/probes/independent/sql.c

@@ -124,13 +124,8 @@ static void __clearmem(void *ptr, int len)
 			register int      l = len % sizeof(uint32_t);
 			register uint8_t *p = (uint8_t *)ptr;
 
-			switch (l) {
-			case 3:
-				p[2] = (uint8_t)(random() % (1 << 8));
-			case 2:
-				p[1] = (uint8_t)(random() % (1 << 8));
-			case 1:
-				p[0] = (uint8_t)(random() % (1 << 8));
+			for (int i = 0; i < l; i++) {
+				p[i] = (uint8_t)(random() % (1 << 8));
 			}
 		} while (0);
 	}
@@ -191,8 +186,9 @@ static int dbURIInfo_parse(dbURIInfo_t *info, const char *conn)
 			if (*(tok) != '=') goto __fail;		\
 			else (dst) = strdup((tok) + 1);		\
 		}						\
-		else dE("Unrecognized token: '%s'", (tok)-1);		\
-	while(0)
+		else {	\
+			dE("Unrecognized token: '%s'", (tok)-1);		\
+		}
 
 #define matchitem2(tok, first, rest1, dst1, rest2, dst2)		\
 	case first:							\
@@ -208,8 +204,9 @@ static int dbURIInfo_parse(dbURIInfo_t *info, const char *conn)
 			if (*(tok) != '=') goto __fail;			\
 			else (dst2) = strdup((tok) + 1);		\
 		}							\
-		else dE("Unrecognized token: '%s'", (tok));		\
-		while(0)
+		else {	\
+			dE("Unrecognized token: '%s'", (tok));		\
+		}
 
 	tmp = NULL;
 

src/OVAL/probes/independent/sql57.c

@@ -124,13 +124,8 @@ static void __clearmem(void *ptr, int len)
 			register int      l = len % sizeof(uint32_t);
 			register uint8_t *p = (uint8_t *)ptr;
 
-			switch (l) {
-			case 3:
-				p[2] = (uint8_t)(random() % (1 << 8));
-			case 2:
-				p[1] = (uint8_t)(random() % (1 << 8));
-			case 1:
-				p[0] = (uint8_t)(random() % (1 << 8));
+			for (int i = 0; i < l; i++) {
+				p[i] = (uint8_t)(random() % (1 << 8));
 			}
 		} while (0);
 	}
@@ -191,8 +186,9 @@ static int dbURIInfo_parse(dbURIInfo_t *info, const char *conn)
 			if (*(tok) != '=') goto __fail;		\
 			else (dst) = strdup((tok) + 1);		\
 		}						\
-		else dE("Unrecognized token: '%s'", (tok)-1);		\
-	while(0)
+		else {	\
+			dE("Unrecognized token: '%s'", (tok)-1);	\
+		}
 
 #define matchitem2(tok, first, rest1, dst1, rest2, dst2)		\
 	case first:							\
@@ -208,8 +204,9 @@ static int dbURIInfo_parse(dbURIInfo_t *info, const char *conn)
 			if (*(tok) != '=') goto __fail;			\
 			else (dst2) = strdup((tok) + 1);		\
 		}							\
-		else dE("Unrecognized token: '%s'", (tok));		\
-		while(0)
+		else {	\
+			dE("Unrecognized token: '%s'", (tok));		\
+		}
 
 	tmp = NULL;