denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

settings: Fix compilation with newer versions of Clang

Browse Source 
Depending on the actual va_list definition it's not valid to compare it
directly or assign NULL.
This commit is contained in:
Tobias Brunner
2018-06-29 11:47:26 +02:00
parent fecafaaca3
commit daa0a0cc1b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/settings/settings.c
+7 -7
View File
@@ -81,11 +81,6 @@ static bool print_key(char *buf, int len, char *start, char *key, va_list args)
char *pos = start; char *pos = start;
bool res; bool res;
if (!args)
{
return snprintf(buf, len, "%s", key) < len;
}
va_copy(copy, args); va_copy(copy, args);
while (TRUE) while (TRUE)
{ {
@@ -192,11 +187,16 @@ static array_t *find_sections(private_settings_t *this, section_t *section,
/** /**
* Resolve the given reference. Not thread-safe. * Resolve the given reference. Not thread-safe.
* Only a vararg function to get an empty va_list.
*/ */
static void resolve_reference(private_settings_t *this, section_ref_t *ref, static void resolve_reference(private_settings_t *this, section_ref_t *ref,
array_t **sections) array_t **sections, ...)
{ {
find_sections(this, this->top, ref->name, NULL, sections); va_list args;
va_start(args, sections);
find_sections(this, this->top, ref->name, args, sections);
va_end(args);
} }
/** /**