src/lib: Move assignment out of if condition
Fix the following error detected by checkpatch:
ERROR: do not use assignment in if condition
TEST=Build and run on Galileo Gen2
Change-Id: I5a08d1647db66bd5d480f81e90d473999c222acf
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18761
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/lib/jpeg.c b/src/lib/jpeg.c
index f06d490..06827ea 100644
--- a/src/lib/jpeg.c
+++ b/src/lib/jpeg.c
@@ -166,7 +166,8 @@
for (;;) {
if (getbyte() != 0xff)
return -1;
- if ((m = getbyte()) == till)
+ m = getbyte();
+ if (m == till)
break;
switch (m) {
@@ -455,15 +456,20 @@
}
while (le <= 24) {
b = *in->p++;
- if (b == 0xff && (m = *in->p++) != 0) {
- if (m == M_EOF) {
- if (in->func && (m = in->func(in->data)) == 0)
- continue;
+ if (b == 0xff) {
+ m = *in->p++;
+ if (m != 0) {
+ if (m == M_EOF) {
+ if (in->func) {
+ m = in->func(in->data);
+ if (m == 0)
+ continue;
+ }
+ in->marker = m;
+ if (le <= 16)
+ bi = bi << 16, le += 16;
+ break;
}
- in->marker = m;
- if (le <= 16)
- bi = bi << 16, le += 16;
- break;
}
bi = bi << 8 | b;
le += 8;
@@ -477,7 +483,8 @@
int m;
in->left = fillbits(in, in->left, in->bits);
- if ((m = in->marker) == 0)
+ m = in->marker;
+ if (m == 0)
return 0;
in->left = 0;
in->marker = 0;