[Mplayer-cvslog] CVS: main m_config.c,1.10,1.11

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv28752

Modified Files:
	m_config.c 
Log Message:
a few 10l fixes by Wei Jiang <jiangw98 at yahoo.com>

Index: m_config.c
===================================================================
RCS file: /cvsroot/mplayer/main/m_config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- m_config.c	20 Oct 2004 01:32:56 -0000	1.10
+++ m_config.c	31 Oct 2004 10:27:40 -0000	1.11
@@ -32,7 +32,10 @@
 #endif
   
   while(i) {
-    sl = i->slots;
+    if (i->flags & M_CFG_OPT_ALIAS)
+      sl = NULL;
+    else
+      sl = i->slots;
     while(sl) {
       m_option_free(i->opt,sl->data);
       st = sl->prev;
@@ -43,7 +46,7 @@
       free(i->name);
     ct = i->next;
     free(i);
-    ct = i;
+    i = ct;
   }
   free(config);  
 }
@@ -149,6 +152,7 @@
   if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) {
     m_option_t *ol = arg->p;
     int i;
+    co->slots = NULL;
     for(i = 0 ; ol[i].name != NULL ; i++)
       m_config_add_option(config,&ol[i], co->name);
   } else {
@@ -174,6 +178,7 @@
       m_option_set(arg,arg->p,sl->data);
     }
     sl->lvl = 0;
+    sl->prev = NULL;
     co->slots = (m_config_save_slot_t*)calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
     co->slots->prev = sl;
     co->slots->lvl = config->lvl;