From 59ee65304f801b6bc2c74fb8aadb694d6edebf18 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Thu, 27 Jul 2023 15:32:56 +0200 Subject: [PATCH] Adjust patch to apply Resolves: rhbz2224578 --- 0023-move-static-objects-to-source-file.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/0023-move-static-objects-to-source-file.patch b/0023-move-static-objects-to-source-file.patch index a22d5de..e761498 100644 --- a/0023-move-static-objects-to-source-file.patch +++ b/0023-move-static-objects-to-source-file.patch @@ -18,6 +18,7 @@ diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h index 9001e59..5e6afd3 100644 --- a/include/ipmitool/ipmi_sdr.h +++ b/include/ipmitool/ipmi_sdr.h + @@ -773,50 +773,7 @@ struct sdr_record_list { #pragma pack(0) #endif @@ -25,7 +26,7 @@ index 9001e59..5e6afd3 100644 - -/* unit description codes (IPMI v1.5 section 37.16) */ -#define UNIT_MAX 0x90 --static const char *__UNUSED__(unit_desc[]) = { +-static const char *unit_desc[] __attribute__ ((unused)) = { -"unspecified", - "degrees C", "degrees F", "degrees K", - "Volts", "Amps", "Watts", "Joules", @@ -50,7 +51,7 @@ index 9001e59..5e6afd3 100644 -/* sensor type codes (IPMI v1.5 table 36.3) - / Updated to v2.0 Table 42-3, Sensor Type Codes */ #define SENSOR_TYPE_MAX 0x2C --static const char *__UNUSED__(sensor_type_desc[]) = { +-static const char *sensor_type_desc[] __attribute__ ((unused)) = { -"reserved", - "Temperature", "Voltage", "Current", "Fan", - "Physical Security", "Platform Security", "Processor", @@ -68,7 +69,7 @@ index 9001e59..5e6afd3 100644 - "Version Change", "FRU State" }; struct sensor_reading { - char s_id[17]; /* name of the sensor */ + char s_id[33]; /* name of the sensor */ diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c index d51c174..eb40b36 100644 --- a/lib/ipmi_sdr.c