100l to albeu for his english grammar, and 10l to me becouse I notice…

…d that lately (my backward compatibilty macro uses M_OPT_UNKNOWN) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10596 b3059339-0415-0410-9bf9-f77b7e298cf2
hanyong · Aug 13, 2003 · 1c4586e · 1c4586e
1 parent 2283b63
commit 1c4586e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
@@ -666,7 +666,7 @@ vo_aa_parseoption(m_option_t * conf, char *opt, char *param){
 	return 1; /* all opt & params accepted */
 
     }
-    return M_OPT_UNKNOW;
+    return M_OPT_UNKNOWN;
 
 }
 

diff --git a/m_config.c b/m_config.c
@@ -229,7 +229,7 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
   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 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
 	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

diff --git a/m_option.c b/m_option.c
@@ -491,7 +491,7 @@ static int parse_str_list(m_option_t* opt,char *name, char *param, void* dst, in
     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 @@ static int parse_subconf(m_option_t* opt,char *name, char *param, void* dst, int
 	  }
 	  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 @@ static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
     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 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
 	     "  %3$s-clr\n"
 	     " Clear the cureent list.\n",name,n,prefix);
 
-      return M_OPT_UNKNOW;
+      return M_OPT_UNKNOWN;
     }
   }
 
@@ -1385,7 +1385,7 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
     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")) {

diff --git a/m_option.h b/m_option.h
@@ -207,7 +207,7 @@ struct m_option {
 #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

diff --git a/parser-cfg.c b/parser-cfg.c
@@ -187,7 +187,7 @@ int m_config_parse_config_file(m_config_t* config, char *conffile)
 		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;
 			}

diff --git a/parser-mecmd.c b/parser-mecmd.c
@@ -86,7 +86,7 @@ m_config_parse_me_command_line(m_config_t *config, int argc, char **argv)
 	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;
 	}

diff --git a/parser-mpcmd.c b/parser-mpcmd.c
@@ -179,7 +179,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
 		}
 	      }
 	    } else {
-	      tmp = M_OPT_UNKNOW;
+	      tmp = M_OPT_UNKNOWN;
 	      mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown option on the command line: %s\n",opt);
 	    }
 	  }
-Original file line number
+Diff line change
@@ Expand Up @@
     	return 1; /* all opt & params accepted */
         }
-        return M_OPT_UNKNOW;
+        return M_OPT_UNKNOWN;
     }
@@ Expand Down @@