Merge branch 'master' of git.philpep.org:wmfs into philpep

This commit is contained in:
Philippe Pepiot 2010-04-20 00:37:47 +02:00
commit e6b26eafc2

View File

@ -493,24 +493,29 @@ fetch_section(struct conf_sec *s, char *name)
struct conf_sec *
fetch_section_first(struct conf_sec *s, char *name)
{
struct conf_sec *sec;
struct conf_sec *sec, *ret = NULL;
if (!name)
return NULL;
if (!s)
{
TAILQ_FOREACH(sec, &config, entry)
if (!strcmp(sec->name, name))
return sec;
if (!strcmp(sec->name, name)) {
ret = sec;
break;
}
}
else
{
TAILQ_FOREACH(sec, &s->sub, entry)
if (!strcmp(sec->name, name)) {
ret = sec;
break;
}
}
if(!sec)
return NULL;
TAILQ_FOREACH(sec, &s->sub, entry)
if (!strcmp(sec->name, name))
return sec;
return NULL;
return ret;
}
size_t