protect multi-statement macros... ie: do { s1; s2; } while(0)

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 335adb794558dd8bbc0b67820b51038c23a78867..c5af7c0d52dfdb308ab8e7ac9d6479a385c07df2 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -58,17 +58,19 @@ extern int  ldap_syslog_level;
 /* this doesn't below as part of ldap.h */
 #ifdef LDAP_SYSLOG
 #define Debug( level, fmt, arg1, arg2, arg3 )  \
-       { \
+       do { \
                if ( ldap_debug & (level) ) \
                        fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \
                if ( ldap_syslog & (level) ) \
                        syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
-       }
+       } while ( 0 )
 #else /* LDAP_SYSLOG */
 #ifndef HAVE_WINSOCK
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
+       do { \
                if ( ldap_debug & (level) ) \
-                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );
+                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \
+       } while ( 0 )
 #else /* !WINSOCK */
 extern void Debug( int level, char* fmt, ... );
 #endif /* !WINSOCK */

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 939a4e83b4bb556ee2c0c3e20565f358c882a459..70abfad3ce573f75b71b5840d74a20c25a010445 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -452,13 +452,13 @@ typedef struct slap_conn {
 
 #if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 ) \
-       { \
+       do { \
                if ( ldap_debug & (level) ) \
                        fprintf( stderr, (fmt), (connid), (opid), (arg1), (arg2), (arg3) );\
                if ( ldap_syslog & (level) ) \
                        syslog( ldap_syslog_level, (fmt), (connid), (opid), (arg1), \
                                (arg2), (arg3) ); \
-       }
+       } while (0)
 #else
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 )
 #endif