From: Hallvard Furuseth Date: Sat, 17 May 2008 00:05:54 +0000 (+0000) Subject: parenthesize some macro args X-Git-Tag: LOCKER_IDS~164 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=08e2ce2d1d6a73fd57fc1ec07a9f6e86372c76e8;p=openldap parenthesize some macro args --- diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index da02058f8c..cad6b7038f 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1371,8 +1371,8 @@ typedef struct Access { #define ACL_PRIV_SET(m,p) do { (m) |= (p); } while(0) #define ACL_PRIV_CLR(m,p) do { (m) &= ~(p); } while(0) -#define ACL_INIT(m) ACL_PRIV_ASSIGN(m, ACL_PRIV_NONE) -#define ACL_INVALIDATE(m) ACL_PRIV_ASSIGN(m, ACL_PRIV_INVALID) +#define ACL_INIT(m) ACL_PRIV_ASSIGN((m), ACL_PRIV_NONE) +#define ACL_INVALIDATE(m) ACL_PRIV_ASSIGN((m), ACL_PRIV_INVALID) #define ACL_GRANT(m,a) ACL_PRIV_ISSET((m),ACL_ACCESS2PRIV(a)) @@ -2687,7 +2687,7 @@ typedef struct OperationBuffer { #define send_ldap_error( op, rs, err, text ) do { \ (rs)->sr_err = err; (rs)->sr_text = text; \ - (op->o_conn->c_send_ldap_result)( op, rs ); \ + ((op)->o_conn->c_send_ldap_result)( op, rs ); \ } while (0) #define send_ldap_discon( op, rs, err, text ) do { \ (rs)->sr_err = err; (rs)->sr_text = text; \