Mercurial > mplayer.hg

changeset 5934:42127864a2b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mp_msg level fix
author albeu
date Thu, 02 May 2002 10:43:27 +0000
parents 14b46420840b
children 5074aa8fae5a
files cfgparser.c
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/cfgparser.c	Thu May 02 10:40:35 2002 +0000
+++ b/cfgparser.c	Thu May 02 10:43:27 2002 +0000
@@ -821,7 +821,7 @@
 		mp_msg(MSGT_CFGPARSER,MSGL_INFO,"Reading config file: %s", conffile);
 
 	if (config->recursion_depth > MAX_RECURSION_DEPTH) {
-		mp_msg(MSGT_CFGPARSER,MSGL_INFO,": too deep 'include'. check your configfiles\n");
+		mp_msg(MSGT_CFGPARSER,MSGL_ERR,": too deep 'include'. check your configfiles\n");
 		ret = -1;
 		goto out;
 	}
@@ -832,14 +832,14 @@
 	}
 
 	if ((line = (char *) malloc(MAX_LINE_LEN + 1)) == NULL) {
-		mp_msg(MSGT_CFGPARSER,MSGL_INFO,"\ncan't get memory for 'line': %s", strerror(errno));
+		mp_msg(MSGT_CFGPARSER,MSGL_FATAL,"\ncan't get memory for 'line': %s", strerror(errno));
 		ret = -1;
 		goto out;
 	}
 
 	if ((fp = fopen(conffile, "r")) == NULL) {
 		if (config->recursion_depth > 1)
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,": %s\n", strerror(errno));
+			mp_msg(MSGT_CFGPARSER,MSGL_ERR,": %s\n", strerror(errno));
 		free(line);
 		ret = 0;
 		goto out;
@@ -849,7 +849,7 @@
 
 	while (fgets(line, MAX_LINE_LEN, fp)) {
 		if (errors >= 16) {
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,"too many errors\n");
+			mp_msg(MSGT_CFGPARSER,MSGL_FATAL,"too many errors\n");
 			goto out;
 		}
 
@@ -872,7 +872,7 @@
 			opt[opt_pos++] = line[line_pos++];
 			if (opt_pos >= MAX_OPT_LEN) {
 				PRINT_LINENUM;
-				mp_msg(MSGT_CFGPARSER,MSGL_INFO,"too long option\n");
+				mp_msg(MSGT_CFGPARSER,MSGL_ERR,"too long option\n");
 				errors++;
 				ret = -1;
 				goto nextline;
@@ -880,7 +880,7 @@
 		}
 		if (opt_pos == 0) {
 			PRINT_LINENUM;
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,"parse error\n");
+			mp_msg(MSGT_CFGPARSER,MSGL_ERR,"parse error\n");
 			ret = -1;
 			errors++;
 			continue;
@@ -899,7 +899,7 @@
 		/* check '=' */
 		if (line[line_pos++] != '=') {
 			PRINT_LINENUM;
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,"option without parameter\n");
+			mp_msg(MSGT_CFGPARSER,MSGL_ERR,"option without parameter\n");
 			ret = -1;
 			errors++;
 			continue;
@@ -917,7 +917,7 @@
 				param[param_pos++] = line[line_pos++];
 				if (param_pos >= MAX_PARAM_LEN) {
 					PRINT_LINENUM;
-					mp_msg(MSGT_CFGPARSER,MSGL_INFO,"too long parameter\n");
+					mp_msg(MSGT_CFGPARSER,MSGL_ERR,"too long parameter\n");
 					ret = -1;
 					errors++;
 					goto nextline;
@@ -930,7 +930,7 @@
 				param[param_pos++] = line[line_pos++];
 				if (param_pos >= MAX_PARAM_LEN) {
 					PRINT_LINENUM;
-					mp_msg(MSGT_CFGPARSER,MSGL_INFO,"too long parameter\n");
+					mp_msg(MSGT_CFGPARSER,MSGL_ERR,"too long parameter\n");
 					ret = -1;
 					errors++;
 					goto nextline;
@@ -942,7 +942,7 @@
 		/* did we read a parameter? */
 		if (param_pos == 0) {
 			PRINT_LINENUM;
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,"option without parameter\n");
+			mp_msg(MSGT_CFGPARSER,MSGL_ERR,"option without parameter\n");
 			ret = -1;
 			errors++;
 			continue;
@@ -961,7 +961,7 @@
 		/* EOL / comment */
 		if (line[line_pos] != '\0' && line[line_pos] != '#') {
 			PRINT_LINENUM;
-			mp_msg(MSGT_CFGPARSER,MSGL_INFO,"extra characters on line: %s\n", line+line_pos);
+			mp_msg(MSGT_CFGPARSER,MSGL_WARN,"extra characters on line: %s\n", line+line_pos);
 			ret = -1;
 		}