Merge pull request #202 from fperrad/20170430_lint

sjaeckel · web-flow · commit 25878ed632d7 · 2017-05-01T22:07:51.000+02:00
more linting
diff --git a/src/hashes/blake2b.c b/src/hashes/blake2b.c
@@ -169,7 +169,7 @@ static void blake2b_set_lastblock(hash_state *md)
 static void blake2b_increment_counter(hash_state *md, ulong64 inc)
 {
    md->blake2b.t[0] += inc;
-   md->blake2b.t[1] += (md->blake2b.t[0] < inc);
+   if (md->blake2b.t[0] < inc) md->blake2b.t[1]++;
 }
 
 static void blake2b_init0(hash_state *md)
diff --git a/src/hashes/blake2s.c b/src/hashes/blake2s.c
@@ -161,7 +161,7 @@ static void blake2s_set_lastblock(hash_state *md)
 static void blake2s_increment_counter(hash_state *md, const ulong32 inc)
 {
    md->blake2s.t[0] += inc;
-   md->blake2s.t[1] += (md->blake2s.t[0] < inc);
+   if (md->blake2s.t[0] < inc) md->blake2s.t[1]++;
 }
 
 static int blake2s_init0(hash_state *md)

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ static void blake2b_set_lastblock(hash_state *md)`
`169`	`169`	`static void blake2b_increment_counter(hash_state *md, ulong64 inc)`
`170`	`170`	`{`
`171`	`171`	`md->blake2b.t[0] += inc;`
`172`		`- md->blake2b.t[1] += (md->blake2b.t[0] < inc);`
	`172`	`+ if (md->blake2b.t[0] < inc) md->blake2b.t[1]++;`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`static void blake2b_init0(hash_state *md)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ static void blake2s_set_lastblock(hash_state *md)`
`161`	`161`	`static void blake2s_increment_counter(hash_state *md, const ulong32 inc)`
`162`	`162`	`{`
`163`	`163`	`md->blake2s.t[0] += inc;`
`164`		`- md->blake2s.t[1] += (md->blake2s.t[0] < inc);`
	`164`	`+ if (md->blake2s.t[0] < inc) md->blake2s.t[1]++;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`static int blake2s_init0(hash_state *md)`