sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commonlib: Fix issues with { } and else

Browse Source 
Fix the following errors and warning detected by checkpatch.pl:

ERROR: open brace '{' following struct go on the same line
ERROR: else should follow close brace '}'
WARNING: else is not generally useful after a break or return

False positives are detected for the following checkpatch.pl error.
ERROR: that open brace { should be on the previous line
These false positives are in cbfs.c for two function definitions.

TEST=Build and run Galileo Gen2

Change-Id: Ic679ff3a2e1cfc0ed52073c20165e05bf21d76f3
Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Reviewed-on: https://review.coreboot.org/18750
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Lee Leahy
2017-03-10 10:53:36 -08:00
parent f339973d6f
commit 72c60a472b
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/commonlib/fsp_relocate.c
View File

@ -266,8 +266,7 @@ static size_t ffs_file_size(const EFI_FFS_FILE_HEADER *ffsfh)
*/ */
uint32_t file2_size = FFS_FILE2_SIZE(ffsfh); uint32_t file2_size = FFS_FILE2_SIZE(ffsfh);
size = read_le32(&file2_size); size = read_le32(&file2_size);
} } else {
else {
size = read_le8(&ffsfh->Size[0]) << 0; size = read_le8(&ffsfh->Size[0]) << 0;
size |= read_le8(&ffsfh->Size[1]) << 8; size |= read_le8(&ffsfh->Size[1]) << 8;
size |= read_le8(&ffsfh->Size[2]) << 16; size |= read_le8(&ffsfh->Size[2]) << 16;

3
src/commonlib/include/commonlib/coreboot_tables.h
View File

@ -77,8 +77,7 @@ static inline struct lb_uint64 pack_lb64(uint64_t value)
return result; return result;
} }
struct lb_header struct lb_header {
{
uint8_t signature[4]; /* LBIO */ uint8_t signature[4]; /* LBIO */
uint32_t header_bytes; uint32_t header_bytes;
uint32_t header_checksum; uint32_t header_checksum;

2
src/commonlib/lz4_wrapper.c
View File

@ -174,7 +174,6 @@ size_t ulz4fn(const void *src, size_t srcn, void *dst, size_t dstn)
memcpy(out, in, size); memcpy(out, in, size);
if (size < b.size) if (size < b.size)
break; /* output overrun */ break; /* output overrun */
else
out += size; out += size;
} else { } else {
/* constant folding essential, do not touch params! */ /* constant folding essential, do not touch params! */
@ -183,7 +182,6 @@ size_t ulz4fn(const void *src, size_t srcn, void *dst, size_t dstn)
full, 0, noDict, out, NULL, 0); full, 0, noDict, out, NULL, 0);
if (ret < 0) if (ret < 0)
break; /* decompression error */ break; /* decompression error */
else
out += ret; out += ret;
} }