[Mplayer-cvslog] CVS: main cfgparser.c,1.36,1.37

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv29757

Modified Files:
	cfgparser.c 
Log Message:
subconfig fix (if sscanf()==1, then null out second (non-present) parameter) and some errormessage fixes

Index: cfgparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/cfgparser.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- cfgparser.c	19 Dec 2001 13:15:49 -0000	1.36
+++ cfgparser.c	23 Dec 2001 21:18:06 -0000	1.37
@@ -79,7 +79,7 @@
 	}
 	if (i == conf_optnr) {
 		if (parser_mode == CONFIG_FILE)
-			mp_msg(MSGT_CFGPARSER, MSGL_ERR, "invalid option:\n");
+			mp_msg(MSGT_CFGPARSER, MSGL_ERR, "invalid option: %s\n", opt);
 		ret = ERR_NOT_AN_OPTION;
 		goto out;
 	}
@@ -87,12 +87,12 @@
 	    conf[i].name, conf[i].p, conf[i].type);
 
 	if (conf[i].flags & CONF_NOCFG && parser_mode == CONFIG_FILE) {
-		mp_msg(MSGT_CFGPARSER, MSGL_ERR, "this option can only be used on command line:\n");
+		mp_msg(MSGT_CFGPARSER, MSGL_ERR, "this option can only be used on command line: %s\n", opt);
 		ret = ERR_NOT_AN_OPTION;
 		goto out;
 	}
 	if (conf[i].flags & CONF_NOCMD && parser_mode == COMMAND_LINE) {
-		mp_msg(MSGT_CFGPARSER, MSGL_ERR, "this option can only be used in config file:\n");
+		mp_msg(MSGT_CFGPARSER, MSGL_ERR, "this option can only be used in config file: %s\n", opt);
 		ret = ERR_NOT_AN_OPTION;
 		goto out;
 	}
@@ -265,6 +265,7 @@
 			    switch(sscanf_ret)
 			    {
 				case 1:
+				    subparam = NULL;
 				case 2:
 				    if ((ret = read_option((struct config *)subconf, subconf_optnr, subopt, subparam)) < 0)
 				    {
@@ -297,7 +298,7 @@
 out:
 	return ret;
 err_missing_param:
-	mp_msg(MSGT_CFGPARSER, MSGL_ERR, "missing parameter: %s\n", param);
+	mp_msg(MSGT_CFGPARSER, MSGL_ERR, "missing parameter for option: %s\n", opt);
 	ret = ERR_MISSING_PARAM;
 	goto out;
 }