clang-tidy: more misc+readability

[alexxy/gromacs.git] / src / gromacs / fileio / md5.cpp

diff --git a/src/gromacs/fileio/md5.cpp b/src/gromacs/fileio/md5.cpp
index bacff2887dcc4170dea63a168d0a5b48f62d4492..9b9e6e88ab1056d0fb1a914f189887bb2e49a84b 100644 (file)
--- a/src/gromacs/fileio/md5.cpp
+++ b/src/gromacs/fileio/md5.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2009,2010,2011,2012,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2009,2010,2011,2012,2014,2015,2018, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -254,8 +254,8 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
        a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
 #define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
 #define SET(a, b, c, d, k, s, Ti) \
-    t = a + F(b, c, d) + X[k] + Ti; \
-    a = ROTATE_LEFT(t, s) + b
+    t   = (a) + F(b, c, d) + X[k] + (Ti); \
+    (a) = ROTATE_LEFT(t, s) + b
     /* Do the following 16 operations. */
     SET(a, b, c, d,  0,  7,  T1);
     SET(d, a, b, c,  1, 12,  T2);
@@ -280,8 +280,8 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
 #define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
 #define SET(a, b, c, d, k, s, Ti) \
-    t = a + G(b, c, d) + X[k] + Ti; \
-    a = ROTATE_LEFT(t, s) + b
+    t   = (a) + G(b, c, d) + X[k] + (Ti); \
+    (a) = ROTATE_LEFT(t, s) + b
     /* Do the following 16 operations. */
     SET(a, b, c, d,  1,  5, T17);
     SET(d, a, b, c,  6,  9, T18);
@@ -306,8 +306,8 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
 #define H(x, y, z) ((x) ^ (y) ^ (z))
 #define SET(a, b, c, d, k, s, Ti) \
-    t = a + H(b, c, d) + X[k] + Ti; \
-    a = ROTATE_LEFT(t, s) + b
+    t   = (a) + H(b, c, d) + X[k] + (Ti); \
+    (a) = ROTATE_LEFT(t, s) + b
     /* Do the following 16 operations. */
     SET(a, b, c, d,  5,  4, T33);
     SET(d, a, b, c,  8, 11, T34);
@@ -332,8 +332,8 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
 #define I(x, y, z) ((y) ^ ((x) | ~(z)))
 #define SET(a, b, c, d, k, s, Ti) \
-    t = a + I(b, c, d) + X[k] + Ti; \
-    a = ROTATE_LEFT(t, s) + b
+    t   = (a) + I(b, c, d) + X[k] + (Ti); \
+    (a) = ROTATE_LEFT(t, s) + b
     /* Do the following 16 operations. */
     SET(a, b, c, d,  0,  6, T49);
     SET(d, a, b, c,  7, 10, T50);