[Mesa-dev] [PATCH 1/3] xmlconfig: use the portable __VA_ARGS__

[Emil Velikov]

On 22 August 2017 at 12:07, Eric Engestrom <eric.engestrom at imgtec.com> wrote:
> On Tuesday, 2017-08-22 11:39:35 +0100, Emil Velikov wrote:
>> From: Emil Velikov <emil.velikov at collabora.com>
>>
>> Follow the example used through mesa and use "..." + "__VA_ARGS__".
>> The former tends to be more common and portable.
>>
>> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
>> ---
>>  src/util/xmlconfig.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
>> index d3f47ecda0c..7d1c524a955 100644
>> --- a/src/util/xmlconfig.c
>> +++ b/src/util/xmlconfig.c
>> @@ -466,11 +466,11 @@ __driUtilMessage(const char *f, ...)
>>                        (int) XML_GetCurrentLineNumber(data->parser), \
>>                        (int) XML_GetCurrentColumnNumber(data->parser)); \
>>  } while (0)
>> -#define XML_WARNING(msg,args...) do { \
>> +#define XML_WARNING(msg, ...) do { \
>>      __driUtilMessage ("Warning in %s line %d, column %d: "msg, data->name, \
>>                        (int) XML_GetCurrentLineNumber(data->parser), \
>>                        (int) XML_GetCurrentColumnNumber(data->parser), \
>> -                      args); \
>> +                      _VA_ARGS__); \
>
> Missing underscore here, and these should be `##__VA_ARGS__` if we want
> to allow trivial `msg` with no argument (which I assume we do?)
>
AFAICT we really don't care if we've got the leading ##.
__driUtilMessage() uses va_start/va_end which should work in either
case.
Regardless adding it would be better indeed.

> With that, series is
> Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
>

Thanks
Emil