X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex%2Fconf.c;h=b90163a20a1d391130d3b7669bc777012d086673;hb=1924fe8c26de2861744fd576631ad15da2759f51;hp=8494050adecb658330055bd5e43302436ece5bd4;hpb=09c82f9c7bc563c081425141853e6ff8e402e358;p=ashd.git

diff --git a/src/dirplex/conf.c b/src/dirplex/conf.c
index 8494050..b90163a 100644
--- a/src/dirplex/conf.c
+++ b/src/dirplex/conf.c
@@ -252,21 +252,6 @@ struct config *readconfig(char *file)
     return(cf);
 }
 
-static void mergechildren(struct config *dst, struct config *src)
-{
-    struct child *ch1, *ch2;
-    
-    for(ch1 = dst->children; ch1 != NULL; ch1 = ch1->next) {
-	for(ch2 = src->children; ch2 != NULL; ch2 = ch2->next) {
-	    if(!strcmp(ch1->name, ch2->name)) {
-		ch1->fd = ch2->fd;
-		ch2->fd = -1;
-		break;
-	    }
-	}
-    }
-}
-
 struct config *getconfig(char *path)
 {
     struct config *cf, *ocf;
@@ -295,7 +280,7 @@ struct config *getconfig(char *path)
 	mtime = sb.st_mtime;
     }
     if(ocf != NULL) {
-	mergechildren(cf, ocf);
+	mergechildren(cf->children, ocf->children);
 	freeconfig(ocf);
     }
     cf->path = sstrdup(path);