# [PATCH] block-sha1: drop trailing semicolon from macro definition 2 messages from 2021-03-13 to 2021-03-15. Participants: René Scharfe., Jonathan Nieder. Thread: https://gitlist.dev/t/55308 ## René Scharfe., 2021-03-13 16:17 Subject: [PATCH] block-sha1: drop trailing semicolon from macro definition Message-ID: URL: https://gitlist.dev/e/f8122736-e729-5d35-e1e1-78a213816d4a%40web.de ``` 23119ffb4e (block-sha1: put expanded macro parameters in parentheses, 2012-07-22) added a trailing semicolon to the definition of SHA_MIX without explanation. It doesn't matter with the current code, but make sure to avoid potential surprises by removing it again. This allows the macro to be used almost like a function: Users can combine it with operators of their choice, but still must not pass an expression with side-effects as a parameter, as it would be evaluated multiple times. Signed-off-by: René Scharfe --- block-sha1/sha1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c index 8681031402..1bb6e7c069 100644 --- a/block-sha1/sha1.c +++ b/block-sha1/sha1.c @@ -70,7 +70,7 @@ * 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_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); \ -- 2.30.2 ``` ## Jonathan Nieder, 2021-03-15 23:07 Subject: Re: [PATCH] block-sha1: drop trailing semicolon from macro definition Message-ID: URL: https://gitlist.dev/e/YE%2Foq5dPDB6PvD22%40google.com In-Reply-To: ``` René Scharfe. wrote: > 23119ffb4e (block-sha1: put expanded macro parameters in parentheses, > 2012-07-22) added a trailing semicolon to the definition of SHA_MIX > without explanation. It doesn't matter with the current code, but make > sure to avoid potential surprises by removing it again. > > This allows the macro to be used almost like a function: Users can > combine it with operators of their choice, but still must not pass an > expression with side-effects as a parameter, as it would be evaluated > multiple times. > > Signed-off-by: René Scharfe > --- > block-sha1/sha1.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Jonathan Nieder Yes, it was just a typo. ```