aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasant Hegde <hegdevasant@linux.vnet.ibm.com>2021-04-05 16:43:47 +0530
committerVasant Hegde <hegdevasant@linux.vnet.ibm.com>2021-04-07 12:09:52 +0530
commit80f02460733c0f9ae9741c4919382efba8b6433c (patch)
tree154394acb0b1d6ba11b957d5f83a2ee38495e4e5
parent7eb8c3afaa1b2d402d107778446e81496b857b98 (diff)
downloadskiboot-80f02460733c0f9ae9741c4919382efba8b6433c.zip
skiboot-80f02460733c0f9ae9741c4919382efba8b6433c.tar.gz
skiboot-80f02460733c0f9ae9741c4919382efba8b6433c.tar.bz2
hw/ipmi: Fix misleading-indentation failures
Hitting below issue on recent distro (fedora-rawhide). sample failure: --------------- [ HOSTCC ] hw/ipmi/test/run-fru.c In file included from hw/ipmi/test/run-fru.c:10: hw/ipmi/test/../ipmi-fru.c: In function 'fru_fill_product_info': hw/ipmi/test/../ipmi-fru.c:80:17: error: this 'if' clause does not guard... [-Werror=misleading-indentation] 80 | if (rc < 1) return OPAL_PARAMETER; rc; }) | ^~ hw/ipmi/test/../ipmi-fru.c:102:18: note: in expansion of macro 'FRU_INSERT_STRING' 102 | index += FRU_INSERT_STRING(&buf[index], info->manufacturer); | ^~~~~~~~~~~~~~~~~ hw/ipmi/test/../ipmi-fru.c:80:52: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' 80 | if (rc < 1) return OPAL_PARAMETER; rc; }) | ^~ hw/ipmi/test/../ipmi-fru.c:102:18: note: in expansion of macro 'FRU_INSERT_STRING' 102 | index += FRU_INSERT_STRING(&buf[index], info->manufacturer); | ^~~~~~~~~~~~~~~~~ Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Reviewed-by: Dan HorĂ¡k <dan@danny.cz>
-rw-r--r--hw/ipmi/ipmi-fru.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ipmi/ipmi-fru.c b/hw/ipmi/ipmi-fru.c
index da866ad..86c9ca0 100644
--- a/hw/ipmi/ipmi-fru.c
+++ b/hw/ipmi/ipmi-fru.c
@@ -77,7 +77,7 @@ static u8 fru_checksum(u8 *buf, int len)
#define FRU_INSERT_STRING(x, y) \
({ rc = fru_insert_string(x, y); \
- if (rc < 1) return OPAL_PARAMETER; rc; })
+ { if (rc < 1) return OPAL_PARAMETER; } rc; })
static int fru_fill_product_info(u8 *buf, struct product_info *info, size_t size)
{