Commit Diff


commit - 68108a4aa05489ffac8c941ae90c4d995f4eaa47
commit + 6a516036da003849e63b9aec1e594548ec0da278
blob - ae4efb7cda41a6f3dd668bb740de9e303daf1eac
blob + d7cfd6900a4db0a54e863e36e34a9a23a922271b
--- pdf.c
+++ pdf.c
@@ -779,30 +779,31 @@ act_nat(const HParseResult *p, void *u)
 
 HParser *p_violsev;
 HParsedToken *
-act_viol(const HParseResult *p, void *viol)
+act_viol(const HParseResult *p, void *u)
 {
+	char *viol = u;
 	uint32_t severity;
 	uint32_t offset;
 	HParseResult *severity_parse;
-	viol = (uint8_t *) viol;
-	severity_parse = h_parse(p_violsev, viol, strlen((char *)viol));
-	if (!severity_parse) {
-	        log_message(99999, "Severity for violation %s not assigned!\n", (char *)viol);
-	        severity = 99999;
-	}
-	else {
+
+	severity_parse = h_parse(p_violsev, (uint8_t *)viol, strlen(viol));
+	if (severity_parse == NULL) {
+	        log_message(99999, "Severity for violation %s not assigned!\n",
+	            viol);
+	        severity = 99999;
+	} else
 	        severity = severity_parse->ast->seq->elements[0]->uint;
-	}
+
 	offset = p->ast->seq->elements[p->ast->seq->used-1]->uint / 8;
-	log_message(severity, "VIOLATION[%d]@%d (0x%x): %s\n", severity, offset, offset, (char *) viol);
-	if (severity > strictness) {
+	log_message(severity, "VIOLATION[%d]@%d (0x%x): %s\n", severity,
+	    offset, offset, viol);
+	if (severity > strictness)
 	        exit(1);
-	}
-	/* Just return the parse AST, drop the h_tell */
-	if (p->ast->seq->used == 1) {
-		return (HParsedToken *) NULL;
-	}
-	return (HParsedToken *) p->ast->seq->elements[0];
+
+	/* just return the parse AST, drop the h_tell() */
+	if (p->ast->seq->used == 1)
+		return NULL;
+	return p->ast->seq->elements[0];
 }
 
 bool