[Mplayer-cvslog] CVS: main parser-mecmd.c,1.1,1.2

Arpi of Ize arpi at mplayerhq.hu
Sat Jan 11 18:01:42 CET 2003


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

Modified Files:
	parser-mecmd.c 
Log Message:
cosmetics


Index: parser-mecmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mecmd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parser-mecmd.c	12 Nov 2002 01:56:21 -0000	1.1
+++ parser-mecmd.c	11 Jan 2003 17:01:23 -0000	1.2
@@ -119,9 +119,13 @@
 	    break;
 	  }
 	}
-	if(!entry || (mp_opt->flags & M_OPT_GLOBAL))
+	if(!entry || (mp_opt->flags & M_OPT_GLOBAL)){
 	  tmp = m_config_set_option(config, opt, argv[i + 1]);
-	else {
+	  if(tmp < 0){
+//	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "m_config_set_option() failed (%d)\n",tmp);
+	    goto err_out;
+	  }
+	} else {
 	  tmp = m_config_check_option(config, opt, argv[i + 1]);
 	  if(tmp >= 0) {
 	    entry->opts = realloc(entry->opts,(no+2)*2*sizeof(char*));
@@ -129,10 +133,11 @@
 	    entry->opts[2*no+1] = argv[i + 1] ? strdup(argv[i + 1]) : NULL;
 	    entry->opts[2*no+2] =  entry->opts[2*no+3] = NULL;
 	    no++;
+	  } else {
+//	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "m_config_set_option() failed (%d)\n",tmp);
+	    goto err_out;
 	  }
 	}
-	if (tmp < 0)
-	  goto err_out;
 	i += tmp;
       } else /* filename */
 	add_file(argv[i]);



More information about the MPlayer-cvslog mailing list