[libvirt] [PATCH] Centralize use of DEBUG macros

Cole Robinson crobinso at redhat.com
Fri Oct 3 14:56:02 UTC 2008


Daniel P. Berrange wrote:
> On Thu, Oct 02, 2008 at 03:40:17PM -0400, Cole Robinson wrote:
>> Currently the DEBUG and DEBUG0 macros are duplicated in
>> every file that uses them. This patch moves the macros
>> to internal.h, removes the needless duplication, and
>> now every file gets them for free. Seems to work as
>> expected in my testing.
> 
> Yes, if someone can confirm one question
> 
>> diff --git a/src/internal.h b/src/internal.h
>> index d96504d..a3d48fa 100644
>> --- a/src/internal.h
>> +++ b/src/internal.h
>> @@ -85,6 +85,9 @@ extern int debugFlag;
>>      do { } while (0)
>>  #endif /* !ENABLE_DEBUG */
>>  
>> +#define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt, __VA_ARGS__)
>> +#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg)
>> +
> 
> Will __FILE__ expand to the name of the file where the DEBUG
> macro is defined - ie internal.h, or will it expand to the
> name of the file where DEBUG() is called. Obviously the latter
> is what we need.
> 
> Daniel

I was worried about that as well, but testing the patch I posted
confirmed that __FILE__ expands to where the macro is called
from, so no change in existing behavior.

Thanks,
Cole




More information about the libvir-list mailing list