From: Jonathan Nieder Date: Sun, 22 Jul 2012 23:40:54 +0000 (-0500) Subject: block-sha1: put expanded macro parameters in parentheses X-Git-Tag: v1.7.12-rc0~1^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23119ffb4ea91cdf30016254df60e1adc64b478c;p=git-core%2Fgit.git block-sha1: put expanded macro parameters in parentheses 't' is currently always a numeric constant, but it can't hurt to prepare for the day that it becomes useful for a caller to pass in a more complex expression. Suggested-by: Linus Torvalds Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c index 10fd94d17..6f885c433 100644 --- a/block-sha1/sha1.c +++ b/block-sha1/sha1.c @@ -100,8 +100,8 @@ * Where do we get the source from? The first 16 iterations get it from * the input data, the next mix it from the 512-bit array. */ -#define SHA_SRC(t) get_be32((unsigned char *) block + t*4) -#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1) +#define SHA_SRC(t) get_be32((unsigned char *) block + (t)*4) +#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1); #define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \ unsigned int TEMP = input(t); setW(t, TEMP); \