clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I98f262c24e427f4228b184715d7ad88b0d7060f6
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/frup.cpp b/frup.cpp
index 8f66a3b..00fcda8 100644
--- a/frup.cpp
+++ b/frup.cpp
@@ -216,8 +216,8 @@
type_code = (type_length & IPMI_FRU_TYPE_LENGTH_TYPE_CODE_MASK) >>
IPMI_FRU_TYPE_LENGTH_TYPE_CODE_SHIFT;
- (*number_of_data_bytes) = type_length &
- IPMI_FRU_TYPE_LENGTH_NUMBER_OF_DATA_BYTES_MASK;
+ (*number_of_data_bytes) =
+ type_length & IPMI_FRU_TYPE_LENGTH_NUMBER_OF_DATA_BYTES_MASK;
/* special case: this shouldn't be a length of 0x01 (see type/length
* byte format in fru information storage definition).
@@ -245,12 +245,12 @@
return (0);
}
-int ipmi_fru_chassis_info_area(const void* areabuf, unsigned int areabuflen,
- uint8_t* chassis_type,
- ipmi_fru_field_t* chassis_part_number,
- ipmi_fru_field_t* chassis_serial_number,
- ipmi_fru_field_t* chassis_custom_fields,
- unsigned int chassis_custom_fields_len)
+int ipmi_fru_chassis_info_area(
+ const void* areabuf, unsigned int areabuflen, uint8_t* chassis_type,
+ ipmi_fru_field_t* chassis_part_number,
+ ipmi_fru_field_t* chassis_serial_number,
+ ipmi_fru_field_t* chassis_custom_fields,
+ unsigned int chassis_custom_fields_len)
{
const uint8_t* areabufptr = (const uint8_t*)areabuf;
unsigned int area_offset = 0;
@@ -497,8 +497,8 @@
goto out;
if (_parse_type_length(areabufptr, areabuflen, area_offset,
- &number_of_data_bytes,
- product_manufacturer_name) < 0)
+ &number_of_data_bytes, product_manufacturer_name) <
+ 0)
goto cleanup;
area_offset += 1; /* type/length byte */
area_offset += number_of_data_bytes;
@@ -516,8 +516,8 @@
goto out;
if (_parse_type_length(areabufptr, areabuflen, area_offset,
- &number_of_data_bytes,
- product_part_model_number) < 0)
+ &number_of_data_bytes, product_part_model_number) <
+ 0)
goto cleanup;
area_offset += 1; /* type/length byte */
area_offset += number_of_data_bytes;
@@ -643,8 +643,8 @@
" Len = [%d] : Val = [%s]\n",
vpd_key_names[vpd_key_id], vpd_val_len, bin_in_ascii);
#endif
- info[vpd_key_id] = std::make_pair(vpd_key_names[vpd_key_id],
- bin_in_ascii);
+ info[vpd_key_id] =
+ std::make_pair(vpd_key_names[vpd_key_id], bin_in_ascii);
break;
case 3:
@@ -750,8 +750,8 @@
printf("Board : Appending [%s] = [%s]\n", vpd_key_names[i],
timestr);
#endif
- info[i] = std::make_pair(vpd_key_names[i],
- std::string(timestr));
+ info[i] =
+ std::make_pair(vpd_key_names[i], std::string(timestr));
continue;
}
_append_to_dict(i, vpd_info[i].type_length_field, info);