X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=options.c;h=e9885a98aa9b8e1d5b0e86e70aa60753f390027a;hb=edb210fc08dad2e23344e0dcb65dd5e28dc3bf9e;hp=3947a38a959855a5621c4673c00bafbb8b198033;hpb=5e635a27701c8565f78feed6a9dce51b09662bde;p=pkg%2Fabook.git

diff --git a/options.c b/options.c
index 3947a38..e9885a9 100644
--- a/options.c
+++ b/options.c
@@ -70,13 +70,13 @@ static struct option abook_vars[] = {
 };
 
 static unsigned char bool_opts[BOOL_MAX];
-static int int_opts[INT_MAX];
+static int int_opts[INT_MAXIMUM];
 static char *str_opts[STR_MAX];
 
 static void
 set_int(enum int_opts opt, int value)
 {
-	assert(opt >= 0 && opt < INT_MAX);
+	assert(opt >= 0 && opt < INT_MAXIMUM);
 
 	int_opts[opt] = value;
 }
@@ -103,7 +103,7 @@ set_str(enum str_opts opt, char *value)
 int
 opt_get_int(enum int_opts opt)
 {
-	assert(opt >= 0 && opt < INT_MAX);
+	assert(opt >= 0 && opt < INT_MAXIMUM);
 
 	return int_opts[opt];
 }
@@ -339,7 +339,7 @@ load_opts(char *filename)
 	FILE *in;
 	char *line = NULL;
 	int n;
-	bool err = FALSE;
+	int err = 0;
 	
 	if((in = fopen(filename, "r")) == NULL)
 		return -1;
@@ -354,7 +354,7 @@ load_opts(char *filename)
 		if(line && *line) {
 			opt_line_remove_comments(line);
 			if(*line)
-				err = opt_parse_line(line, n, filename);
+				err += opt_parse_line(line, n, filename) ? 1:0;
 		}
 
 		my_free(line);
@@ -362,11 +362,6 @@ load_opts(char *filename)
 
 	free(line);
 
-	if(err) {
-		printf("Press enter to continue...\n");
-		fgetc(stdin);
-	}
-	
 	return err;
 }