[coreboot-gerrit] New patch to review for coreboot: commonlib: Fix issues with { } and else
Lee Leahy (leroy.p.leahy@intel.com)
gerrit at coreboot.org
Fri Mar 10 20:11:17 CET 2017
Lee Leahy (leroy.p.leahy at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18750
-gerrit
commit 7d1d2a9e9e979f0101b9f2f82a7f57ce2817bcb8
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date: Fri Mar 10 10:53:36 2017 -0800
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 at intel.com>
---
src/commonlib/fsp_relocate.c | 3 +--
src/commonlib/include/commonlib/coreboot_tables.h | 3 +--
src/commonlib/lz4_wrapper.c | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/commonlib/fsp_relocate.c b/src/commonlib/fsp_relocate.c
index 57c0ac9..fd5a348 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 339503a..f11fad6 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 0342868..3fb6ae0 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;
More information about the coreboot-gerrit
mailing list