rp

commit 6cbc357f8a2da645539a7d35c5ec2cacec7795ff
parent a78f132522f60debce045440c1074720148135db
Author: parazyd <parazyd@dyne.org>
Date:   Sat, 10 Mar 2018 13:45:57 +0100

rpsieve: die on invalid line.

Also remove the warn function in ind.c

Diffstat:
M
ind.c
 | 
9
---------
M
ind.h
 | 
1
-
M
sieve.c
 | 
6
+++---

3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/ind.c b/ind.c
@@ -33,15 +33,6 @@ void die(char *fmt, ...) {
 	exit(1);
 }
 
-void warn(char *fmt, ...) {
-	va_list fmtargs;
-
-	va_start(fmtargs, fmt);
-	fprintf(stderr, " \033[33m*\033[0m ");
-	vfprintf(stderr, fmt, fmtargs);
-	va_end(fmtargs);
-}
-
 void info(char *fmt, ...) {
 	va_list fmtargs;
 
diff --git a/ind.h b/ind.h
@@ -14,7 +14,6 @@
 
 void edie(char *fmt, ...);
 void die(char *fmt, ...);
-void warn(char *fmt, ...);
 void info(char *fmt, ...);
 
 void *reallocz(void *p, int l, int z);
diff --git a/sieve.c b/sieve.c
@@ -93,15 +93,15 @@ int sievemain(int argc, char *argv[]) {
 		strtok(l, "\n");
 		if (!strncmp("to", l, 2)) {
 			if (gento(l))
-				warn("invalid line %d: %s\n", c, l);
+				die("invalid line %d: %s\n", c, l);
 		}
 		else if (!strncmp("from", l, 4)) {
 			if (genfrom(l))
-				warn("invalid line %d: %s\n", c, l);
+				die("invalid line %d: %s\n", c, l);
 		}
 		else if (!strncmp("email=", l, 6)) {
 			if (genabook(l))
-				warn("invalid line %d: %s\n", c, l);
+				die("invalid line %d: %s\n", c, l);
 		}
 	}
 	printf("\n");