commit d86a45f991693cf2367a6ccb94fc29c22f5f7b45 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Feb 9 00:14:45 2013 -0500 Wrap more macro definitions in (parentheses) To avoid surprises, good coding practice suggests parenthesizing every macro definition -- or at the very least, all those involving an expression. --- src/or/onion_fast.h | 2 +- src/or/or.h | 4 ++-- src/or/rendservice.c | 2 +- src/or/rephist.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/onion_fast.h b/src/or/onion_fast.h index 0c2a475..8c07837 100644 --- a/src/or/onion_fast.h +++ b/src/or/onion_fast.h @@ -13,7 +13,7 @@ #define TOR_ONION_FAST_H #define CREATE_FAST_LEN DIGEST_LEN -#define CREATED_FAST_LEN DIGEST_LEN*2 +#define CREATED_FAST_LEN (DIGEST_LEN*2) typedef struct fast_handshake_state_t { uint8_t state[DIGEST_LEN]; diff --git a/src/or/or.h b/src/or/or.h index a0a921a..04640d0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4586,12 +4586,12 @@ typedef struct rend_encoded_v2_service_descriptor_t { * sooner.) * * XXX023 Should this be configurable? */ -#define INTRO_POINT_LIFETIME_MIN_SECONDS 18*60*60 +#define INTRO_POINT_LIFETIME_MIN_SECONDS (18*60*60) /** The maximum number of seconds that an introduction point will last * before expiring due to old age. * * XXX023 Should this be configurable? */ -#define INTRO_POINT_LIFETIME_MAX_SECONDS 24*60*60 +#define INTRO_POINT_LIFETIME_MAX_SECONDS (24*60*60) /** Introduction point information. Used both in rend_service_t (on * the service side) and in rend_service_descriptor_t (on both the diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f85ac2c..10d232c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -88,7 +88,7 @@ typedef struct rend_service_port_config_t { /** How many seconds should we wait for new HS descriptors to reach * our clients before we close an expiring intro point? */ -#define INTRO_POINT_EXPIRATION_GRACE_PERIOD 5*60 +#define INTRO_POINT_EXPIRATION_GRACE_PERIOD (5*60) /** Represents a single hidden service running at this OP. */ typedef struct rend_service_t { diff --git a/src/or/rephist.c b/src/or/rephist.c index 34caa4b..1bee645 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1549,7 +1549,7 @@ rep_hist_get_bandwidth_lines(void) /* [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */ /* The n,n,n part above. Largest representation of a uint64_t is 20 chars * long, plus the comma. */ -#define MAX_HIST_VALUE_LEN 21*NUM_TOTALS +#define MAX_HIST_VALUE_LEN (21*NUM_TOTALS) len = (67+MAX_HIST_VALUE_LEN)*4; buf = tor_malloc_zero(len); cp = buf;