stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

htsmsg: add missing va_end() calls - coverity

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-03 17:20:19 +02:00
parent 2e858f339c
commit 52c812280a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/htsmsg.c
View file

@ -651,10 +651,12 @@ htsmsg_get_map_multi(htsmsg_t *msg, ...)
{
va_list ap;
const char *n;
va_start(ap, msg);
va_start(ap, msg);
while(msg != NULL && (n = va_arg(ap, char *)) != NULL)
msg = htsmsg_get_map(msg, n);
va_end(ap);
return msg;
}
@ -667,18 +669,20 @@ htsmsg_get_str_multi(htsmsg_t *msg, ...)
va_list ap;
const char *n;
htsmsg_field_t *f;
va_start(ap, msg);
va_start(ap, msg);
while((n = va_arg(ap, char *)) != NULL) {
if((f = htsmsg_field_find(msg, n)) == NULL)
return NULL;
break;
else if(f->hmf_type == HMF_STR)
return f->hmf_str;
else if(f->hmf_type == HMF_MAP)
msg = &f->hmf_msg;
else
return NULL;
break;
}
va_end(ap);
return NULL;
}