[MPlayer-cvslog] CVS: main parser-mecmd.c, 1.12, 1.13 parser-mpcmd.c, 1.25, 1.26
Reynaldo H. Verdejo Pinochet
reynaldo at opendot.cl
Sat Apr 22 09:09:40 CEST 2006
On Wed, Apr 19, 2006 at 05:50:40PM +0200, Reimar D�ffinger CVS wrote:
> CVS change done by Reimar Döffinger CVS
>
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv5191
>
> Modified Files:
> parser-mecmd.c parser-mpcmd.c
> Log Message:
> also print an error when parsing fails with M_OPT_INVALID or M_OPT_PARSER_ERR.
> fixes MPlayer exiting without message for e.g. "mplayer -ao"
>
>
> Index: parser-mecmd.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/parser-mecmd.c,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -r1.12 -r1.13
> --- parser-mecmd.c 23 Jan 2006 11:33:18 -0000 1.12
> +++ parser-mecmd.c 19 Apr 2006 15:50:37 -0000 1.13
> @@ -97,8 +97,10 @@
> opt_exit = 1;
> tmp = M_OPT_EXIT - tmp;
> }
> + else
> if(tmp < 0){
> // mp_msg(MSGT_CFGPARSER, MSGL_ERR, "m_config_set_option() failed (%d)\n",tmp);
> + mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Error parsing option on the command line: -%s\n",opt);
IMHO this should be a fatal.
> goto err_out;
> }
> } else {
>
> Index: parser-mpcmd.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
> retrieving revision 1.25
> retrieving revision 1.26
> diff -u -r1.25 -r1.26
> --- parser-mpcmd.c 14 Apr 2006 21:51:45 -0000 1.25
> +++ parser-mpcmd.c 19 Apr 2006 15:50:37 -0000 1.26
> @@ -199,6 +199,7 @@
> tmp = M_OPT_EXIT - tmp;
> } else
> if (tmp < 0) {
> + mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Error parsing option on the command line: -%s\n",opt);
Same here, MSGL_ERR implies program execution continues.
Best regards
Reynaldo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/attachments/20060422/8f9fdb19/attachment.pgp>
More information about the MPlayer-cvslog
mailing list