[Mplayer-cvslog] CVS: main m_config.c,1.8,1.9 m_option.c,1.16,1.17 m_option.h,1.8,1.9 parser-cfg.c,1.5,1.6 parser-mecmd.c,1.6,1.7 parser-mpcmd.c,1.13,1.14

[Alex Beregszaszi]

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

Modified Files:
	m_config.c m_option.c m_option.h parser-cfg.c parser-mecmd.c 
	parser-mpcmd.c 
Log Message:
100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)

Index: m_config.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- m_config.c	13 Aug 2003 16:29:00 -0000	1.8
+++ m_config.c	13 Aug 2003 16:44:39 -0000	1.9
@@ -229,7 +229,7 @@
   co = m_config_get_co(config,arg);
   if(!co){
 //    mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg);
-    return M_OPT_UNKNOW;
+    return M_OPT_UNKNOWN;
   }
 
 #ifdef MP_DEBUG
@@ -263,7 +263,7 @@
 	sprintf(n,"%s:%s",co->name,lst[2*i]);
 	sr = m_config_parse_option(config,n,lst[2*i+1],set);
 	if(sr < 0){
-	  if(sr == M_OPT_UNKNOW){
+	  if(sr == M_OPT_UNKNOWN){
 	    mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'\n",co->name,lst[2*i]);
 	    r = M_OPT_INVALID;
 	  } else

Index: m_option.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- m_option.c	13 Aug 2003 16:29:00 -0000	1.16
+++ m_option.c	13 Aug 2003 16:44:39 -0000	1.17
@@ -491,7 +491,7 @@
     else if(strcasecmp(n,"-clr") == 0)
       op = OP_CLR;
     else
-      return M_OPT_UNKNOW;
+      return M_OPT_UNKNOWN;
   }
 
   // Clear the list ??
@@ -870,7 +870,7 @@
 	  }
 	  if(!subopts[i].name) {
 	    mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Unknown suboption %s\n",name,subopt);
-	    return M_OPT_UNKNOW;
+	    return M_OPT_UNKNOWN;
 	  }
 	  r = m_option_parse(&subopts[i],subopt,
 			     subparam[0] == 0 ? NULL : subparam,NULL,src);
@@ -1030,7 +1030,7 @@
     opt = m_option_list_find(desc->fields,str);
     if(!opt) {
       mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s doesn't have a %s parameter\n",opt_name,obj_name,str);
-      return M_OPT_UNKNOW;
+      return M_OPT_UNKNOWN;
     }
     r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE);
     if(r < 0) {
@@ -1356,7 +1356,7 @@
 	     "  %3$s-clr\n"
 	     " Clear the cureent list.\n",name,n,prefix);
       
-      return M_OPT_UNKNOW;
+      return M_OPT_UNKNOWN;
     }
   }
 
@@ -1385,7 +1385,7 @@
     break;
   default:
     mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: FIXME\n",name);
-    return M_OPT_UNKNOW;
+    return M_OPT_UNKNOWN;
   }
 
   if(!strcmp(param,"help")) {

Index: m_option.h
===================================================================
RCS file: /cvsroot/mplayer/main/m_option.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- m_option.h	13 Aug 2003 16:29:00 -0000	1.8
+++ m_option.h	13 Aug 2003 16:44:39 -0000	1.9
@@ -207,7 +207,7 @@
 #define M_COMMAND_LINE 1
 
 // Option parser error code
-#define M_OPT_UNKNOW		-1
+#define M_OPT_UNKNOWN		-1
 #define M_OPT_MISSING_PARAM	-2
 #define M_OPT_INVALID		-3
 #define M_OPT_OUT_OF_RANGE	-4

Index: parser-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-cfg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parser-cfg.c	13 Aug 2003 16:29:01 -0000	1.5
+++ parser-cfg.c	13 Aug 2003 16:44:39 -0000	1.6
@@ -187,7 +187,7 @@
 		tmp = m_config_set_option(config, opt, param);
 		if (tmp < 0) {
 			PRINT_LINENUM;
-			if(tmp == M_OPT_UNKNOW) {
+			if(tmp == M_OPT_UNKNOWN) {
 				mp_msg(MSGT_CFGPARSER,MSGL_WARN,"Warning unknown option %s at line %d\n", opt,line_num);
 				continue;
 			}

Index: parser-mecmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mecmd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- parser-mecmd.c	13 Aug 2003 16:29:01 -0000	1.6
+++ parser-mecmd.c	13 Aug 2003 16:44:39 -0000	1.7
@@ -86,7 +86,7 @@
 	mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt);
 	mp_opt = m_config_get_option(config,opt);
 	if(!mp_opt) {
-	  tmp = M_OPT_UNKNOW;
+	  tmp = M_OPT_UNKNOWN;
 	  mp_msg(MSGT_CFGPARSER, MSGL_ERR, "%s is not an MEncoder option\n",opt);
 	  goto err_out;
 	}

Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- parser-mpcmd.c	13 Aug 2003 16:29:01 -0000	1.13
+++ parser-mpcmd.c	13 Aug 2003 16:44:39 -0000	1.14
@@ -179,7 +179,7 @@
 		}
 	      }
 	    } else {
-	      tmp = M_OPT_UNKNOW;
+	      tmp = M_OPT_UNKNOWN;
 	      mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown option on the command line: %s\n",opt);
 	    }
 	  }