summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Leahy <leroy.p.leahy@intel.com>2017-03-10 10:53:36 -0800
committerLee Leahy <leroy.p.leahy@intel.com>2017-03-10 22:27:18 +0100
commit72c60a472b393363722e0c6093f696ee28a7f56a (patch)
treec9da90286df444c755f47d0b0f224df523c213e1
parentf339973d6f1e9daae13ae4d0e6a437812b14bbd8 (diff)
commonlib: Fix issues with { } and else
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)
-rw-r--r--src/commonlib/fsp_relocate.c3
-rw-r--r--src/commonlib/include/commonlib/coreboot_tables.h3
-rw-r--r--src/commonlib/lz4_wrapper.c6
3 files changed, 4 insertions, 8 deletions
diff --git a/src/commonlib/fsp_relocate.c b/src/commonlib/fsp_relocate.c
index 57c0ac99eb..fd5a348c16 100644
--- a/src/commonlib/fsp_relocate.c
+++ b/src/commonlib/fsp_relocate.c
@@ -266,8 +266,7 @@ static size_t ffs_file_size(const EFI_FFS_FILE_HEADER *ffsfh)
*/
uint32_t file2_size = FFS_FILE2_SIZE(ffsfh);
size = read_le32(&file2_size);
- }
- else {
+ } else {
size = read_le8(&ffsfh->Size[0]) << 0;
size |= read_le8(&ffsfh->Size[1]) << 8;
size |= read_le8(&ffsfh->Size[2]) << 16;
diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h
index 339503ad36..f11fad6aa0 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -77,8 +77,7 @@ static inline struct lb_uint64 pack_lb64(uint64_t value)
return result;
}
-struct lb_header
-{
+struct lb_header {
uint8_t signature[4]; /* LBIO */
uint32_t header_bytes;
uint32_t header_checksum;
diff --git a/src/commonlib/lz4_wrapper.c b/src/commonlib/lz4_wrapper.c
index 0342868d74..3fb6ae0892 100644
--- a/src/commonlib/lz4_wrapper.c
+++ b/src/commonlib/lz4_wrapper.c
@@ -174,8 +174,7 @@ size_t ulz4fn(const void *src, size_t srcn, void *dst, size_t dstn)
memcpy(out, in, size);
if (size < b.size)
break; /* output overrun */
- else
- out += size;
+ out += size;
} else {
/* constant folding essential, do not touch params! */
int ret = LZ4_decompress_generic(in, out, b.size,
@@ -183,8 +182,7 @@ size_t ulz4fn(const void *src, size_t srcn, void *dst, size_t dstn)
full, 0, noDict, out, NULL, 0);
if (ret < 0)
break; /* decompression error */
- else
- out += ret;
+ out += ret;
}
in += b.size;