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

ID:355 - Fix ``ISO C forbids omitting the middle term of a ?: expression''

Browse Source 
Commit fixes omitted middle terms of ternary expressions.
This commit is contained in:
Zdenek Styblik 2014-12-30 08:00:23 +01:00
parent 70984dcad5
commit 48117f5ddf
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ipmi_channel.c
View File

@ -360,7 +360,7 @@ ipmi_get_user_access(struct ipmi_intf *intf, uint8_t channel, uint8_t userid)
int max_uid = 0; int max_uid = 0;
int init = 1; int init = 1;
curr_uid = userid ? : 1; curr_uid = userid ? userid : 1;
memset(&req1, 0, sizeof(req1)); memset(&req1, 0, sizeof(req1));
req1.msg.netfn = IPMI_NETFN_APP; req1.msg.netfn = IPMI_NETFN_APP;

2
lib/ipmi_sel.c
View File

@ -2919,7 +2919,7 @@ ipmi_sel_show_entry(struct ipmi_intf * intf, int argc, char ** argv)
/* print SDR entry */ /* print SDR entry */
oldv = verbose; oldv = verbose;
verbose = verbose ? : 1; verbose = verbose ? verbose : 1;
switch (sdr->type) { switch (sdr->type) {
case SDR_RECORD_TYPE_FULL_SENSOR: case SDR_RECORD_TYPE_FULL_SENSOR:
case SDR_RECORD_TYPE_COMPACT_SENSOR: case SDR_RECORD_TYPE_COMPACT_SENSOR:

10
src/ipmievd.c
View File

@ -284,7 +284,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
eintf->prefix, eintf->prefix,
type, type,
sdr->record.full->id_string, sdr->record.full->id_string,
desc ? : "", desc ? desc : "",
(evt->sel_type.standard_type.event_dir (evt->sel_type.standard_type.event_dir
? "Deasserted" : "Asserted"), ? "Deasserted" : "Asserted"),
(trigger_reading==(int)trigger_reading) ? 0 : 2, (trigger_reading==(int)trigger_reading) ? 0 : 2,
@ -304,7 +304,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
*/ */
lprintf(LOG_NOTICE, "%s%s sensor %s %s %s", lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
eintf->prefix, type, eintf->prefix, type,
sdr->record.full->id_string, desc ? : "", sdr->record.full->id_string, desc ? desc : "",
(evt->sel_type.standard_type.event_dir (evt->sel_type.standard_type.event_dir
? "Deasserted" : "Asserted")); ? "Deasserted" : "Asserted"));
if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) { if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) {
@ -317,7 +317,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
*/ */
lprintf(LOG_NOTICE, "%s%s sensor %s %s %s", lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
eintf->prefix, type, eintf->prefix, type,
sdr->record.full->id_string, desc ? : "", sdr->record.full->id_string, desc ? desc : "",
(evt->sel_type.standard_type.event_dir (evt->sel_type.standard_type.event_dir
? "Deasserted" : "Asserted")); ? "Deasserted" : "Asserted"));
} }
@ -326,7 +326,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
case SDR_RECORD_TYPE_COMPACT_SENSOR: case SDR_RECORD_TYPE_COMPACT_SENSOR:
lprintf(LOG_NOTICE, "%s%s sensor %s - %s %s", lprintf(LOG_NOTICE, "%s%s sensor %s - %s %s",
eintf->prefix, type, eintf->prefix, type,
sdr->record.compact->id_string, desc ? : "", sdr->record.compact->id_string, desc ? desc : "",
(evt->sel_type.standard_type.event_dir (evt->sel_type.standard_type.event_dir
? "Deasserted" : "Asserted")); ? "Deasserted" : "Asserted"));
break; break;
@ -334,7 +334,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
default: default:
lprintf(LOG_NOTICE, "%s%s sensor - %s", lprintf(LOG_NOTICE, "%s%s sensor - %s",
eintf->prefix, type, eintf->prefix, type,
evt->sel_type.standard_type.sensor_num, desc ? : ""); evt->sel_type.standard_type.sensor_num, desc ? desc : "");
break; break;
} }