deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 18:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use __UNUSED__ macro instead of gcc specific attribute

Browse Source 
Use __UNUSED__ macro defined in helper.h instead of the gcc-specific
attribute unused macro.

Partially resolves ipmitool/ipmitool#13

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture 2018-11-20 09:11:36 -08:00 committed by Alexander Amelkin
parent 9a55136bfb
commit d6d9c85139
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ipmitool/ipmi_fru.h
View File

@ -194,7 +194,7 @@ struct fru_multirec_powersupply {
#pragma pack(0) #pragma pack(0)
#endif #endif
static const char * combined_voltage_desc[] __attribute__((unused)) = { static const char * __UNUSED__(combined_voltage_desc[]) = {
"12 V", "-12 V", "5 V", "3.3 V"}; "12 V", "-12 V", "5 V", "3.3 V"};
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
@ -608,7 +608,7 @@ static inline time_t ipmi_fru2time_t(void *mfg_date) {
return ts; return ts;
} }
static const char * chassis_type_desc[] __attribute__((unused)) = { static const char * __UNUSED__(chassis_type_desc[]) = {
"Unspecified", "Other", "Unknown", "Unspecified", "Other", "Unknown",
"Desktop", "Low Profile Desktop", "Pizza Box", "Desktop", "Low Profile Desktop", "Pizza Box",
"Mini Tower", "Tower", "Mini Tower", "Tower",

2
include/ipmitool/ipmi_lanp.h
View File

@ -131,7 +131,7 @@ static struct lan_param {
char desc[24]; char desc[24];
uint8_t * data; uint8_t * data;
int data_len; int data_len;
} ipmi_lan_params[] __attribute__((unused)) = { } __UNUSED__(ipmi_lan_params[]) = {
{ IPMI_LANP_SET_IN_PROGRESS, 1, "Set in Progress", NULL, 0 }, { IPMI_LANP_SET_IN_PROGRESS, 1, "Set in Progress", NULL, 0 },
{ IPMI_LANP_AUTH_TYPE, 1, "Auth Type Support", NULL, 0 }, { IPMI_LANP_AUTH_TYPE, 1, "Auth Type Support", NULL, 0 },
{ IPMI_LANP_AUTH_TYPE_ENABLE, 5, "Auth Type Enable", NULL, 0 }, { IPMI_LANP_AUTH_TYPE_ENABLE, 5, "Auth Type Enable", NULL, 0 },

20
include/ipmitool/ipmi_pef.h
View File

@ -112,7 +112,7 @@ struct bit_desc_map { /* description text container */
}; };
static struct bit_desc_map static struct bit_desc_map
pef_b2s_actions __attribute__((unused)) = { __UNUSED__(pef_b2s_actions) = {
BIT_DESC_MAP_ALL, BIT_DESC_MAP_ALL,
{ {"Alert", PEF_ACTION_ALERT}, { {"Alert", PEF_ACTION_ALERT},
{"Power-off", PEF_ACTION_POWER_DOWN}, {"Power-off", PEF_ACTION_POWER_DOWN},
@ -124,7 +124,7 @@ BIT_DESC_MAP_ALL,
} }; } };
static struct bit_desc_map static struct bit_desc_map
pef_b2s_severities __attribute__((unused)) = { __UNUSED__(pef_b2s_severities) = {
BIT_DESC_MAP_ANY, BIT_DESC_MAP_ANY,
{ {"Non-recoverable", PEF_SEVERITY_NON_RECOVERABLE}, { {"Non-recoverable", PEF_SEVERITY_NON_RECOVERABLE},
{"Critical", PEF_SEVERITY_CRITICAL}, {"Critical", PEF_SEVERITY_CRITICAL},
@ -136,7 +136,7 @@ BIT_DESC_MAP_ANY,
} }; } };
static struct bit_desc_map static struct bit_desc_map
pef_b2s_sensortypes __attribute__((unused)) = { __UNUSED__(pef_b2s_sensortypes) = {
BIT_DESC_MAP_LIST, BIT_DESC_MAP_LIST,
{ {"Any", 255}, { {"Any", 255},
{"Temperature", 1}, {"Temperature", 1},
@ -313,7 +313,7 @@ BIT_DESC_MAP_LIST,
} }; } };
static struct bit_desc_map * static struct bit_desc_map *
pef_b2s_generic_ER[] __attribute__((unused)) = { __UNUSED__(pef_b2s_generic_ER[]) = {
&pef_b2s_gentype_1, &pef_b2s_gentype_1,
&pef_b2s_gentype_2, &pef_b2s_gentype_2,
&pef_b2s_gentype_3, &pef_b2s_gentype_3,
@ -356,7 +356,7 @@ struct pef_policy_entry {
#endif #endif
static struct bit_desc_map static struct bit_desc_map
pef_b2s_policies __attribute__((unused)) = { __UNUSED__(pef_b2s_policies) = {
BIT_DESC_MAP_LIST, BIT_DESC_MAP_LIST,
{ {"Match-always", PEF_POLICY_FLAGS_MATCH_ALWAYS}, { {"Match-always", PEF_POLICY_FLAGS_MATCH_ALWAYS},
{"Try-next-entry", PEF_POLICY_FLAGS_PREV_OK_SKIP}, {"Try-next-entry", PEF_POLICY_FLAGS_PREV_OK_SKIP},
@ -367,7 +367,7 @@ BIT_DESC_MAP_LIST,
} }; } };
static struct bit_desc_map static struct bit_desc_map
pef_b2s_ch_medium __attribute__((unused)) = { __UNUSED__(pef_b2s_ch_medium) = {
#define PEF_CH_MEDIUM_TYPE_IPMB 1 #define PEF_CH_MEDIUM_TYPE_IPMB 1
#define PEF_CH_MEDIUM_TYPE_ICMB_10 2 #define PEF_CH_MEDIUM_TYPE_ICMB_10 2
#define PEF_CH_MEDIUM_TYPE_ICMB_09 3 #define PEF_CH_MEDIUM_TYPE_ICMB_09 3
@ -450,7 +450,7 @@ struct pef_cfgparm_control {
#endif #endif
static struct bit_desc_map static struct bit_desc_map
pef_b2s_control __attribute__((unused)) = { __UNUSED__(pef_b2s_control) = {
BIT_DESC_MAP_ALL, BIT_DESC_MAP_ALL,
{ {"PEF", PEF_CONTROL_ENABLE}, { {"PEF", PEF_CONTROL_ENABLE},
{"PEF event messages", PEF_CONTROL_ENABLE_EVENT_MESSAGES}, {"PEF event messages", PEF_CONTROL_ENABLE_EVENT_MESSAGES},
@ -656,7 +656,7 @@ struct pef_lan_cfgparm_dest_type {
#endif #endif
static struct bit_desc_map static struct bit_desc_map
pef_b2s_lan_desttype __attribute__((unused)) = { __UNUSED__(pef_b2s_lan_desttype) = {
BIT_DESC_MAP_LIST, BIT_DESC_MAP_LIST,
{ {"Acknowledged", PEF_LAN_DEST_TYPE_ACK}, { {"Acknowledged", PEF_LAN_DEST_TYPE_ACK},
{"PET", PEF_LAN_DEST_TYPE_PET}, {"PET", PEF_LAN_DEST_TYPE_PET},
@ -755,7 +755,7 @@ struct pef_serial_cfgparm_dest_info {
#endif #endif
static struct bit_desc_map static struct bit_desc_map
pef_b2s_serial_desttype __attribute__((unused)) = { __UNUSED__(pef_b2s_serial_desttype) = {
BIT_DESC_MAP_LIST, BIT_DESC_MAP_LIST,
{ {"Acknowledged", PEF_SERIAL_DEST_TYPE_ACK}, { {"Acknowledged", PEF_SERIAL_DEST_TYPE_ACK},
{"TAP page", PEF_SERIAL_DEST_TYPE_TAP}, {"TAP page", PEF_SERIAL_DEST_TYPE_TAP},
@ -835,7 +835,7 @@ struct pef_serial_cfgparm_tap_svc_settings {
#endif #endif
static struct bit_desc_map static struct bit_desc_map
pef_b2s_tap_svc_confirm __attribute__((unused)) = { __UNUSED__(pef_b2s_tap_svc_confirm) = {
BIT_DESC_MAP_LIST, BIT_DESC_MAP_LIST,
{ {"ACK", PEF_SERIAL_TAP_CONFIRMATION_ACK_AFTER_ETX}, { {"ACK", PEF_SERIAL_TAP_CONFIRMATION_ACK_AFTER_ETX},
{"211+ACK", PEF_SERIAL_TAP_CONFIRMATION_211_ACK_AFTER_ETX}, {"211+ACK", PEF_SERIAL_TAP_CONFIRMATION_211_ACK_AFTER_ETX},

6
include/ipmitool/ipmi_picmg.h
View File

@ -93,7 +93,7 @@ typedef enum picmg_busres_resource_id {
} t_picmg_busres_resource_id; } t_picmg_busres_resource_id;
/* the LED color capabilities */ /* the LED color capabilities */
static const char* led_color_str[] __attribute__((unused)) = { static const char* __UNUSED__(led_color_str[]) = {
"reserved", "reserved",
"BLUE", "BLUE",
"RED", "RED",
@ -105,7 +105,7 @@ static const char* led_color_str[] __attribute__((unused)) = {
}; };
static const char* amc_link_type_str[] __attribute__((unused)) = { static const char* __UNUSED__(amc_link_type_str[]) = {
"RESERVED", "RESERVED",
"RESERVED1", "RESERVED1",
"PCI EXPRESS", "PCI EXPRESS",
@ -116,7 +116,7 @@ static const char* amc_link_type_str[] __attribute__((unused)) = {
"STORAGE", "STORAGE",
}; };
static const char* amc_link_type_ext_str[][16] __attribute__((unused)) = { static const char* __UNUSED__(amc_link_type_ext_str[][16]) = {
/* FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED */ /* FRU_PICMGEXT_AMC_LINK_TYPE_RESERVED */
{ {
"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""

4
include/ipmitool/ipmi_sdr.h
View File

@ -776,7 +776,7 @@ struct sdr_record_list {
/* unit description codes (IPMI v1.5 section 37.16) */ /* unit description codes (IPMI v1.5 section 37.16) */
#define UNIT_MAX 0x90 #define UNIT_MAX 0x90
static const char *unit_desc[] __attribute__ ((unused)) = { static const char *__UNUSED__(unit_desc[]) = {
"unspecified", "unspecified",
"degrees C", "degrees F", "degrees K", "degrees C", "degrees F", "degrees K",
"Volts", "Amps", "Watts", "Joules", "Volts", "Amps", "Watts", "Joules",
@ -801,7 +801,7 @@ static const char *unit_desc[] __attribute__ ((unused)) = {
/* sensor type codes (IPMI v1.5 table 36.3) /* sensor type codes (IPMI v1.5 table 36.3)
/ Updated to v2.0 Table 42-3, Sensor Type Codes */ / Updated to v2.0 Table 42-3, Sensor Type Codes */
#define SENSOR_TYPE_MAX 0x2C #define SENSOR_TYPE_MAX 0x2C
static const char *sensor_type_desc[] __attribute__ ((unused)) = { static const char *__UNUSED__(sensor_type_desc[]) = {
"reserved", "reserved",
"Temperature", "Voltage", "Current", "Fan", "Temperature", "Voltage", "Current", "Fan",
"Physical Security", "Platform Security", "Processor", "Physical Security", "Platform Security", "Processor",

2
lib/ipmi_sel.c
View File

@ -420,7 +420,7 @@ ipmi_sel_add_entries_fromfile(struct ipmi_intf * intf, const char * filename)
return rc; return rc;
} }
static struct ipmi_event_sensor_types oem_kontron_event_reading_types[] __attribute__((unused)) = { static struct ipmi_event_sensor_types __UNUSED__(oem_kontron_event_reading_types[]) = {
{ 0x70 , 0x00 , 0xff, "Code Assert" }, { 0x70 , 0x00 , 0xff, "Code Assert" },
{ 0x71 , 0x00 , 0xff, "Code Assert" }, { 0x71 , 0x00 , 0xff, "Code Assert" },
{ 0, 0, 0xFF, NULL } { 0, 0, 0xFF, NULL }

2
src/plugins/lan/asf.h
View File

@ -41,7 +41,7 @@
#define ASF_TYPE_PING 0x80 #define ASF_TYPE_PING 0x80
#define ASF_TYPE_PONG 0x40 #define ASF_TYPE_PONG 0x40
static const struct valstr asf_type_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(asf_type_vals[]) = {
{ 0x10, "Reset" }, { 0x10, "Reset" },
{ 0x11, "Power-up" }, { 0x11, "Power-up" },
{ 0x12, "Unconditional Power-down" }, { 0x12, "Unconditional Power-down" },

4
src/plugins/lan/rmcp.h
View File

@ -46,7 +46,7 @@
#define RMCP_TYPE_NORM 0x00 #define RMCP_TYPE_NORM 0x00
#define RMCP_TYPE_ACK 0x01 #define RMCP_TYPE_ACK 0x01
static const struct valstr rmcp_type_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(rmcp_type_vals[]) = {
{ RMCP_TYPE_NORM, "Normal RMCP" }, { RMCP_TYPE_NORM, "Normal RMCP" },
{ RMCP_TYPE_ACK, "RMCP ACK" }, { RMCP_TYPE_ACK, "RMCP ACK" },
{ 0, NULL } { 0, NULL }
@ -57,7 +57,7 @@ static const struct valstr rmcp_type_vals[] __attribute__((unused)) = {
#define RMCP_CLASS_IPMI 0x07 #define RMCP_CLASS_IPMI 0x07
#define RMCP_CLASS_OEM 0x08 #define RMCP_CLASS_OEM 0x08
static const struct valstr rmcp_class_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(rmcp_class_vals[]) = {
{ RMCP_CLASS_ASF, "ASF" }, { RMCP_CLASS_ASF, "ASF" },
{ RMCP_CLASS_IPMI, "IPMI" }, { RMCP_CLASS_IPMI, "IPMI" },
{ RMCP_CLASS_OEM, "OEM" }, { RMCP_CLASS_OEM, "OEM" },

2
src/plugins/lanplus/asf.h
View File

@ -41,7 +41,7 @@
#define ASF_TYPE_PING 0x80 #define ASF_TYPE_PING 0x80
#define ASF_TYPE_PONG 0x40 #define ASF_TYPE_PONG 0x40
static const struct valstr asf_type_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(asf_type_vals[]) = {
{ 0x10, "Reset" }, { 0x10, "Reset" },
{ 0x11, "Power-up" }, { 0x11, "Power-up" },
{ 0x12, "Unconditional Power-down" }, { 0x12, "Unconditional Power-down" },

4
src/plugins/lanplus/rmcp.h
View File

@ -45,7 +45,7 @@
#define RMCP_TYPE_NORM 0x00 #define RMCP_TYPE_NORM 0x00
#define RMCP_TYPE_ACK 0x01 #define RMCP_TYPE_ACK 0x01
static const struct valstr rmcp_type_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(rmcp_type_vals[]) = {
{ RMCP_TYPE_NORM, "Normal RMCP" }, { RMCP_TYPE_NORM, "Normal RMCP" },
{ RMCP_TYPE_ACK, "RMCP ACK" }, { RMCP_TYPE_ACK, "RMCP ACK" },
{ 0, NULL } { 0, NULL }
@ -56,7 +56,7 @@ static const struct valstr rmcp_type_vals[] __attribute__((unused)) = {
#define RMCP_CLASS_IPMI 0x07 #define RMCP_CLASS_IPMI 0x07
#define RMCP_CLASS_OEM 0x08 #define RMCP_CLASS_OEM 0x08
static const struct valstr rmcp_class_vals[] __attribute__((unused)) = { static const struct valstr __UNUSED__(rmcp_class_vals[]) = {
{ RMCP_CLASS_ASF, "ASF" }, { RMCP_CLASS_ASF, "ASF" },
{ RMCP_CLASS_IPMI, "IPMI" }, { RMCP_CLASS_IPMI, "IPMI" },
{ RMCP_CLASS_OEM, "OEM" }, { RMCP_CLASS_OEM, "OEM" },