diff options
| author | Lee Leahy <leroy.p.leahy@intel.com> | 2017-03-09 17:35:28 -0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-03-13 17:16:08 +0100 |
| commit | 35af5c47b030c0a1837cb34bc9ae4d50734fefb0 (patch) | |
| tree | 0e0f1d541d170095fe22739d38a7f02d77c4329e /src/lib/lzmadecode.c | |
| parent | fece39baa5ce730d8467454e5ce407c0bc45cb78 (diff) | |
| download | coreboot-35af5c47b030c0a1837cb34bc9ae4d50734fefb0.tar.xz | |
src/lib: Fix spacing
Fix the following errors and warnings detected by checkpatch.pl:
ERROR: spaces required around that '?' (ctx:WxV)
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: spaces required around that '<' (ctx:VxV)
ERROR: spaces required around that '+=' (ctx:VxV)
ERROR: space required after that ',' (ctx:VxV)
ERROR: space required before the open brace '{'
ERROR: space required after that close brace '}'
ERROR: need consistent spacing around '+' (ctx:WxV)
ERROR: need consistent spacing around '*' (ctx:WxV)
ERROR: need consistent spacing around '&' (ctx:VxW)
ERROR: spaces required around that '?' (ctx:VxW)
ERROR: spaces required around that ':' (ctx:VxW)
ERROR: trailing whitespace
ERROR: space prohibited before that '++' (ctx:WxO)
ERROR: space prohibited before that ',' (ctx:WxW)
ERROR: space prohibited after that '!' (ctx:BxW)
ERROR: spaces prohibited around that '->' (ctx:VxW)
ERROR: space prohibited after that '-' (ctx:WxW)
WARNING: space prohibited before semicolon
WARNING: unnecessary whitespace before a quoted newline
WARNING: missing space after return type
Note that lib/libgcov.c and lib/lzmadecode.c are providing false
positives for ERROR: need consistent spacing around '*' (ctx:WxV)
An example is:
void __gcov_merge_add(gcov_type *counters __attribute__ ((unused)),
unsigned int n_counters __attribute__ ((unused))) {}
TEST=Build and run on Galileo Gen2
Change-Id: I0016327a5754018eaeb25bedf42338291632c7c1
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18733
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/lib/lzmadecode.c')
| -rw-r--r-- | src/lib/lzmadecode.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/lib/lzmadecode.c b/src/lib/lzmadecode.c index c0efda5f8d..d2769d9e8f 100644 --- a/src/lib/lzmadecode.c +++ b/src/lib/lzmadecode.c @@ -37,9 +37,15 @@ : ((((uintptr_t) Buffer & 3) || ((SizeT) (BufferLim - Buffer) <= 4)) ? (*Buffer++) \ : ((look_ahead.dw = *(UInt32 *)Buffer), (Buffer += 4), (look_ahead_ptr = 1), look_ahead.raw[0]))) -#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \ - { int i; for (i = 0; i < 5; i++) { RC_TEST; Code = (Code << 8) \ - | RC_READ_BYTE; }} +#define RC_INIT2 Code = 0; Range = 0xFFFFFFFF; \ +{ \ + int i; \ + \ + for (i = 0; i < 5; i++) { \ + RC_TEST; \ + Code = (Code << 8) | RC_READ_BYTE; \ + } \ +} #define RC_TEST { if (Buffer == BufferLim) return LZMA_RESULT_DATA_ERROR; } @@ -57,7 +63,7 @@ { UpdateBit0(p); mi <<= 1; A0; } else \ { UpdateBit1(p); mi = (mi + mi) + 1; A1; } -#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ; , ;) +#define RC_GET_BIT(p, mi) RC_GET_BIT2(p, mi, ;, ;) #define RangeDecoderBitTreeDecode(probs, numLevels, res) \ { \ @@ -192,7 +198,7 @@ int LzmaDecode(CLzmaDecoderState *vs, while (nowPos < outSize) { CProb *prob; UInt32 bound; - int posState = (int)((nowPos)& posStateMask); + int posState = (int)((nowPos)&posStateMask); prob = p + IsMatch + (state << kNumPosBitsMax) + posState; IfBit0(prob) { @@ -346,7 +352,7 @@ int LzmaDecode(CLzmaDecoderState *vs, int mi = 1; do { CProb *prob3 = prob + mi; - RC_GET_BIT2(prob3, mi, ; , rep0 |= i); + RC_GET_BIT2(prob3, mi, ;, rep0 |= i); i <<= 1; } while (--numDirectBits != 0); } |