diff options
| author | Christopher R. Hertel <crh@samba.org> | 1998-08-11 18:56:03 +0000 |
|---|---|---|
| committer | Christopher R. Hertel <crh@samba.org> | 1998-08-11 18:56:03 +0000 |
| commit | 53b433e6ab9fd69a02016ee4f2a3f756640ea565 (patch) | |
| tree | e388fa46b1d73620138c8646ef2367c23d19045f | |
| parent | 8fedcfc48da2741722b867bbb056a078901e7431 (diff) | |
| download | samba-53b433e6ab9fd69a02016ee4f2a3f756640ea565.tar.gz samba-53b433e6ab9fd69a02016ee4f2a3f756640ea565.tar.xz samba-53b433e6ab9fd69a02016ee4f2a3f756640ea565.zip | |
I've come up with a different scheme for doing the DEBUG() and DEBUGADD()
macros that meets the RVALUE requirement and doesn't use the (a?b:c) format
that Andrew called "ugly". I've added the new macros but kept the old
macros within a #if 0..#else..#endif block in case I've missed somthing.
Basically, I've used
(void)( (a) && (b) )
or
(void)( (a) && (b) && (c) )
instead of
( (a) ? (void)(b) : (void)(c) )
or similar. I have this compiled and running now.
Here's the diff:
$ cvs diff smb.h
Enter passphrase for RSA key 'crh@Ruby':
Index: smb.h
===================================================================
RCS file: /data/cvs/samba/source/include/smb.h,v
retrieving revision 1.172
diff -r1.172 smb.h
143a144,145
> #if 0
>
150a153,164
>
> #else
>
> #define DEBUG( level, body ) \
> (void)( (DEBUGLEVEL >= (level)) \
> && (dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) )) \
> && (dbgtext body) )
>
> #define DEBUGADD( level, body ) \
> (void)( (DEBUGLEVEL >= (level)) && (dbgtext body) )
>
> #endif
Chris -)-----
| -rw-r--r-- | source/include/smb.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/include/smb.h b/source/include/smb.h index 5d408719ae0..69f98dfdee7 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -141,6 +141,8 @@ BOOL dbgtext(); ( (DEBUGLEVEL >= (level)) \ && dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) ) ) +#if 0 + #define DEBUG( level, body ) \ ( ( DEBUGLEVEL >= (level) \ && dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) ) ) \ @@ -149,6 +151,18 @@ BOOL dbgtext(); #define DEBUGADD( level, body ) \ ( (DEBUGLEVEL >= (level)) ? (void)(dbgtext body) : (void)0 ) +#else + +#define DEBUG( level, body ) \ + (void)( (DEBUGLEVEL >= (level)) \ + && (dbghdr( level, FILE_MACRO, FUNCTION_MACRO, (__LINE__) )) \ + && (dbgtext body) ) + +#define DEBUGADD( level, body ) \ + (void)( (DEBUGLEVEL >= (level)) && (dbgtext body) ) + +#endif + /* End Debugging code section. * -------------------------------------------------------------------------- ** */ |