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

fix error message display

Browse Source
This commit is contained in:
Duncan Laurie 2005-03-24 01:34:25 +00:00
parent e05098f802
commit d2364e50b2
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
ipmitool/lib/ipmi_sol.c
View File

@ -136,9 +136,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -174,9 +174,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -213,9 +213,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -251,9 +251,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -289,9 +289,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -326,9 +326,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -363,9 +363,9 @@ ipmi_get_sol_info(
val2str(data[1], sol_parameter_vals)); val2str(data[1], sol_parameter_vals));
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -401,9 +401,9 @@ ipmi_get_sol_info(
params->payload_channel = channel; params->payload_channel = channel;
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -439,9 +439,9 @@ ipmi_get_sol_info(
params->payload_port = intf->session->port; params->payload_port = intf->session->port;
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error requesting SOL parameter '%s", lprintf(LOG_ERR, "Error requesting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, val2str(data[1], sol_parameter_vals),
val2str(data[1], sol_parameter_vals)); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {
@ -915,11 +915,14 @@ ipmi_sol_set_param(struct ipmi_intf * intf,
/* The command proper */ /* The command proper */
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
if (rsp == NULL) {
lprintf(LOG_ERR, "Error setting SOL parameter '%s'", param);
return -1;
}
if (!rsp || rsp->ccode) { if (rsp->ccode > 0) {
lprintf(LOG_ERR, "Error:%x Error setting SOL parameter %s", lprintf(LOG_ERR, "Error setting SOL parameter '%s': %s",
rsp ? rsp->ccode : 0, param, val2str(rsp->ccode, completion_code_vals));
param);
if (bGuarded && if (bGuarded &&
(ipmi_sol_set_param(intf, (ipmi_sol_set_param(intf,
@ -1125,8 +1128,8 @@ ipmi_sol_deactivate(struct ipmi_intf * intf)
lprintf(LOG_ERR, "Info: SOL payload type disabled"); lprintf(LOG_ERR, "Info: SOL payload type disabled");
break; break;
default: default:
lprintf(LOG_ERR, "Error:%x Error activating SOL payload", lprintf(LOG_ERR, "Error activating SOL payload: %s",
rsp ? rsp->ccode : 0); val2str(rsp->ccode, completion_code_vals));
break; break;
} }
} else { } else {
@ -1455,8 +1458,8 @@ ipmi_sol_activate(struct ipmi_intf * intf)
lprintf(LOG_ERR, "Info: cannot activate SOL payload without encryption"); lprintf(LOG_ERR, "Info: cannot activate SOL payload without encryption");
return -1; return -1;
default: default:
lprintf(LOG_ERR, "Error:%x Error activating SOL payload", lprintf(LOG_ERR, "Error activating SOL payload: %s",
rsp ? rsp->ccode : 0); val2str(rsp->ccode, completion_code_vals));
return -1; return -1;
} }
} else { } else {