From: Jonathan Nieder <jrnieder@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Michael Cree <mcree@orcon.net.nz>,
Linus Torvalds <torvalds@linux-foundation.org>,
Nicolas Pitre <nico@fluxnic.net>
Subject: [PATCH 2/2] block-sha1: put expanded macro parameters in parentheses
Date: Sun, 22 Jul 2012 18:40:54 -0500 [thread overview]
Message-ID: <20120722234054.GB2012@burratino> (raw)
In-Reply-To: <20120722233547.GA1978@burratino>
'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 <torvalds@linux-foundation.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Clarified subject line. No other change.
Thanks for reading.
block-sha1/sha1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index 10fd94d1..6f885c43 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); \
--
1.7.10.4
next prev parent reply other threads:[~2012-07-22 23:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-22 23:35 [PATCH lt/block-sha1 0/2 v3] block-sha1: avoid pointer conversion that violates alignment constraints Jonathan Nieder
2012-07-22 23:39 ` [PATCH 1/2] " Jonathan Nieder
2012-07-22 23:40 ` Jonathan Nieder [this message]
2012-07-23 4:28 ` [PATCH lt/block-sha1 0/2 v3] " Junio C Hamano
2012-07-23 4:51 ` Jonathan Nieder
2012-07-23 5:10 ` Junio C Hamano
2012-07-23 5:28 ` Jonathan Nieder
2012-07-23 5:42 ` Junio C Hamano
2012-07-23 6:29 ` [PATCH/RFC 3/1] Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120722234054.GB2012@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mcree@orcon.net.nz \
--cc=nico@fluxnic.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).