libpldm: Trailing comment formatting
Something changed in CI recently which meant these issues are now picked
up. I always hit these conflicts locally and it never really made sense
to me why I hit them, but oh well. This appears to be fixed now.
Change-Id: I46a280a826126d683fd2b8cb7b95639aa5d9d39f
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
diff --git a/tests/libpldm_platform_test.cpp b/tests/libpldm_platform_test.cpp
index 0747af8..834c778 100644
--- a/tests/libpldm_platform_test.cpp
+++ b/tests/libpldm_platform_test.cpp
@@ -3255,21 +3255,21 @@
0x1,
0x0,
0x0,
- 0x0, // record handle
- 0x1, // PDRHeaderVersion
- PLDM_NUMERIC_SENSOR_PDR, // PDRType
+ 0x0, // record handle
+ 0x1, // PDRHeaderVersion
+ PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_MIN_LENGTH,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
1,
0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3294,12 +3294,12 @@
0x80,
0x3f, // offset=1.0
0,
- 0, // accuracy
- 0, // plusTolerance
- 0, // minusTolerance
- 3, // hysteresis = 3
- 0, // supportedThresholds
- 0, // thresholdAndHysteresisVolatility
+ 0, // accuracy
+ 0, // plusTolerance
+ 0, // minusTolerance
+ 3, // hysteresis = 3
+ 0, // supportedThresholds
+ 0, // thresholdAndHysteresisVolatility
0,
0,
0x80,
@@ -3384,19 +3384,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3480,19 +3480,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH * 2 +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH * 2,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3531,31 +3531,31 @@
0,
0,
0x80,
- 0x3f, // updateInverval=1.0
+ 0x3f, // updateInverval=1.0
0,
- 0x10, // maxReadable = 4096
+ 0x10, // maxReadable = 4096
0,
0, // minReadable = 0
PLDM_RANGE_FIELD_FORMAT_UINT16, // rangeFieldFormat
0, // rangeFieldsupport
0x88,
- 0x13, // nominalValue = 5,000
+ 0x13, // nominalValue = 5,000
0x70,
- 0x17, // normalMax = 6,000
+ 0x17, // normalMax = 6,000
0xa0,
- 0x0f, // normalMin = 4,000
+ 0x0f, // normalMin = 4,000
0x58,
- 0x1b, // warningHigh = 7,000
+ 0x1b, // warningHigh = 7,000
0xb8,
- 0x0b, // warningLow = 3,000
+ 0x0b, // warningLow = 3,000
0x40,
- 0x1f, // criticalHigh = 8,000
+ 0x1f, // criticalHigh = 8,000
0xd0,
- 0x07, // criticalLow = 2,000
+ 0x07, // criticalLow = 2,000
0x28,
- 0x23, // fatalHigh = 9,000
+ 0x23, // fatalHigh = 9,000
0xe8,
- 0x03 // fatalLow = 1,000
+ 0x03 // fatalLow = 1,000
};
struct pldm_numeric_sensor_value_pdr decodedPdr;
@@ -3588,19 +3588,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH * 2 +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH * 2,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3639,31 +3639,31 @@
0,
0,
0x80,
- 0x3f, // updateInverval=1.0
+ 0x3f, // updateInverval=1.0
0xe8,
- 0x03, // maxReadable = 1000
+ 0x03, // maxReadable = 1000
0x18,
0xfc, // minReadable = -1000
PLDM_RANGE_FIELD_FORMAT_SINT16, // rangeFieldFormat
0, // rangeFieldsupport
0,
- 0, // nominalValue = 0
+ 0, // nominalValue = 0
0xf4,
- 0x01, // normalMax = 500
+ 0x01, // normalMax = 500
0x0c,
- 0xfe, // normalMin = -500
+ 0xfe, // normalMin = -500
0xe8,
- 0x03, // warningHigh = 1,000
+ 0x03, // warningHigh = 1,000
0x18,
- 0xfc, // warningLow = -1,000
+ 0xfc, // warningLow = -1,000
0xd0,
- 0x07, // criticalHigh = 2,000
+ 0x07, // criticalHigh = 2,000
0x30,
- 0xf8, // criticalLow = -2,000
+ 0xf8, // criticalLow = -2,000
0xb8,
- 0x0b, // fatalHigh = 3,000
+ 0x0b, // fatalHigh = 3,000
0x48,
- 0xf4 // fatalLow = -3,000
+ 0xf4 // fatalLow = -3,000
};
struct pldm_numeric_sensor_value_pdr decodedPdr;
@@ -3696,19 +3696,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH * 4 +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH * 4,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3828,19 +3828,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH * 4 +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH * 4,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -3960,19 +3960,19 @@
0x1, // PDRHeaderVersion
PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_SENSOR_DATA_SIZE_MIN_LENGTH * 4 +
PLDM_PDR_NUMERIC_SENSOR_PDR_VARIED_RANGE_FIELD_MIN_LENGTH * 4,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
@@ -4089,21 +4089,21 @@
0x1,
0x0,
0x0,
- 0x0, // record handle
- 0x1, // PDRHeaderVersion
- PLDM_NUMERIC_SENSOR_PDR, // PDRType
+ 0x0, // record handle
+ 0x1, // PDRHeaderVersion
+ PLDM_NUMERIC_SENSOR_PDR, // PDRType
0x0,
- 0x0, // recordChangeNumber
+ 0x0, // recordChangeNumber
PLDM_PDR_NUMERIC_SENSOR_PDR_FIXED_LENGTH,
- 0, // dataLength
+ 0, // dataLength
0,
- 0, // PLDMTerminusHandle
+ 0, // PLDMTerminusHandle
0x1,
- 0x0, // sensorID=1
+ 0x0, // sensorID=1
PLDM_ENTITY_POWER_SUPPLY,
- 0, // entityType=Power Supply(120)
+ 0, // entityType=Power Supply(120)
1,
- 0, // entityInstanceNumber
+ 0, // entityInstanceNumber
0x1,
0x0, // containerID=1
PLDM_NO_INIT, // sensorInit
diff --git a/tests/libpldm_utils_test.cpp b/tests/libpldm_utils_test.cpp
index 0b787e5..663a531 100644
--- a/tests/libpldm_utils_test.cpp
+++ b/tests/libpldm_utils_test.cpp
@@ -84,7 +84,7 @@
TEST(TimeLegal, TimeLegal)
{
EXPECT_EQ(true, is_time_legal(30, 25, 16, 18, 8, 2019));
- EXPECT_EQ(true, is_time_legal(30, 25, 16, 29, 2, 2020)); // leap year
+ EXPECT_EQ(true, is_time_legal(30, 25, 16, 29, 2, 2020)); // leap year
EXPECT_EQ(false, is_time_legal(30, 25, 16, 18, 8, 1960)); // year illegal
EXPECT_EQ(false, is_time_legal(30, 25, 16, 18, 15, 2019)); // month illegal