From 47e42d3f3293eef4ce4a36a3044d02f570bb6a5a Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 17 Mar 2005 03:28:53 +0000 Subject: [PATCH] fix compile errors when -Wall is specified --- ipmitool/lib/helper.c | 1 + ipmitool/lib/ipmi_channel.c | 1 + ipmitool/lib/ipmi_lanp.c | 1 + ipmitool/lib/ipmi_raw.c | 2 +- ipmitool/lib/ipmi_sdr.c | 26 +++++++++++++------------- ipmitool/lib/ipmi_sensor.c | 2 +- ipmitool/lib/ipmi_sol.c | 2 ++ ipmitool/src/plugins/lanplus/lanplus.c | 4 ++-- 8 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ipmitool/lib/helper.c b/ipmitool/lib/helper.c index 38ceb2b..51a2ffd 100644 --- a/ipmitool/lib/helper.c +++ b/ipmitool/lib/helper.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/ipmitool/lib/ipmi_channel.c b/ipmitool/lib/ipmi_channel.c index 87ca238..0ed1a25 100644 --- a/ipmitool/lib/ipmi_channel.c +++ b/ipmitool/lib/ipmi_channel.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/ipmitool/lib/ipmi_lanp.c b/ipmitool/lib/ipmi_lanp.c index 08d3a3b..17a8166 100644 --- a/ipmitool/lib/ipmi_lanp.c +++ b/ipmitool/lib/ipmi_lanp.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/ipmitool/lib/ipmi_raw.c b/ipmitool/lib/ipmi_raw.c index 102ab6f..29e88e5 100644 --- a/ipmitool/lib/ipmi_raw.c +++ b/ipmitool/lib/ipmi_raw.c @@ -60,7 +60,7 @@ ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv) } else if (argc > sizeof(data)) { - printf("Raw command input limit (%d bytes) exceeded\n", sizeof(data)); + lprintf(LOG_NOTICE, "Raw command input limit (256 bytes) exceeded"); return -1; } diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c index e5c7660..9e758a2 100644 --- a/ipmitool/lib/ipmi_sdr.c +++ b/ipmitool/lib/ipmi_sdr.c @@ -35,8 +35,8 @@ */ #include -#include +#include #include #include #include @@ -131,37 +131,37 @@ sdr_convert_sensor_reading(struct sdr_record_full_sensor * sensor, case SDR_SENSOR_L_LINEAR: break; case SDR_SENSOR_L_LN: - result = log(result); + result = logf(result); break; case SDR_SENSOR_L_LOG10: - result = log10(result); + result = log10f(result); break; case SDR_SENSOR_L_LOG2: - result = log2(result); + result = (float)(logf(result) / logf(2.0)); break; case SDR_SENSOR_L_E: - result = exp(result); + result = expf(result); break; case SDR_SENSOR_L_EXP10: - result = exp10(result); + result = powf(10.0, result); break; case SDR_SENSOR_L_EXP2: - result = exp2(result); + result = powf(2.0, result); break; case SDR_SENSOR_L_1_X: - result = pow(result, -1.0); /*1/x w/o exception*/ + result = powf(result, -1.0); /*1/x w/o exception*/ break; case SDR_SENSOR_L_SQR: - result = result * result; + result = powf(result, 2.0); break; case SDR_SENSOR_L_CUBE: - result = pow(result, 3.0); + result = powf(result, 3.0); break; case SDR_SENSOR_L_SQRT: - result = sqrt(result); + result = sqrtf(result); break; case SDR_SENSOR_L_CUBERT: - result = cbrt(result); + result = cbrtf(result); break; } @@ -422,7 +422,7 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf, /* only handle linear sensors and linearized sensors (for now) */ if (sensor->linearization>=SDR_SENSOR_L_NONLINEAR) { printf("sensor %s non-linear!\n", desc); - return; + return -1; } /* get sensor reading */ diff --git a/ipmitool/lib/ipmi_sensor.c b/ipmitool/lib/ipmi_sensor.c index 1a85475..6c1b3ea 100644 --- a/ipmitool/lib/ipmi_sensor.c +++ b/ipmitool/lib/ipmi_sensor.c @@ -195,7 +195,7 @@ ipmi_sensor_print_full_analog(struct ipmi_intf * intf, /* only handle linear and linearized sensors (for now) */ if (sensor->linearization>=SDR_SENSOR_L_NONLINEAR) { printf("sensor %s non-linear!\n", id); - return; + return -1; } /* diff --git a/ipmitool/lib/ipmi_sol.c b/ipmitool/lib/ipmi_sol.c index 558e5f7..0794e23 100644 --- a/ipmitool/lib/ipmi_sol.c +++ b/ipmitool/lib/ipmi_sol.c @@ -36,8 +36,10 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/ipmitool/src/plugins/lanplus/lanplus.c b/ipmitool/src/plugins/lanplus/lanplus.c index c4c64f4..aa58bb9 100644 --- a/ipmitool/src/plugins/lanplus/lanplus.c +++ b/ipmitool/src/plugins/lanplus/lanplus.c @@ -498,11 +498,11 @@ ipmi_handle_pong(struct ipmi_intf * intf, struct ipmi_rs * rsp) printf(" ASF Version %s\n" " RMCP Version %s\n" " RMCP Sequence %d\n" - " IANA Enterprise %ld\n\n", + " IANA Enterprise %lu\n\n", (pong->sup_entities & 0x01) ? "1.0" : "unknown", (pong->rmcp.ver == 6) ? "1.0" : "unknown", pong->rmcp.seq, - ntohl(pong->iana)); + (unsigned long)ntohl(pong->iana)); return (pong->sup_entities & 0x80) ? 1 : 0; }