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

change formatting to be consistant

Browse Source
This commit is contained in:
Duncan Laurie 2004-11-17 23:21:48 +00:00
parent 279053aa84
commit 0aba9fc8b6
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ipmitool/lib/ipmi_sensor.c
View File

@ -175,6 +175,9 @@ ipmi_sensor_print_full_discrete(struct ipmi_intf * intf,
printf("Sensor ID : %s (0x%x)\n", printf("Sensor ID : %s (0x%x)\n",
id, sensor->keys.sensor_num); id, sensor->keys.sensor_num);
printf(" Entity ID : %d.%d\n",
sensor->entity.id, sensor->entity.instance);
printf(" Sensor Type (Discrete): %s\n", printf(" Sensor Type (Discrete): %s\n",
ipmi_sdr_get_sensor_type_desc(sensor->sensor.type)); ipmi_sdr_get_sensor_type_desc(sensor->sensor.type));
@ -368,6 +371,9 @@ ipmi_sensor_print_full_analog(struct ipmi_intf * intf,
printf("Sensor ID : %s (0x%x)\n", printf("Sensor ID : %s (0x%x)\n",
id, sensor->keys.sensor_num); id, sensor->keys.sensor_num);
printf(" Entity ID : %d.%d\n",
sensor->entity.id, sensor->entity.instance);
printf(" Sensor Type (Analog) : %s\n", printf(" Sensor Type (Analog) : %s\n",
ipmi_sdr_get_sensor_type_desc(sensor->sensor.type)); ipmi_sdr_get_sensor_type_desc(sensor->sensor.type));
@ -507,6 +513,9 @@ void ipmi_sensor_print_compact(struct ipmi_intf * intf,
printf("Sensor ID : %s (0x%x)\n", printf("Sensor ID : %s (0x%x)\n",
id, sensor->keys.sensor_num); id, sensor->keys.sensor_num);
printf(" Entity ID : %d.%d\n",
sensor->entity.id, sensor->entity.instance);
printf(" Sensor Type (Discrete): %s\n", printf(" Sensor Type (Discrete): %s\n",
ipmi_sdr_get_sensor_type_desc(sensor->sensor.type)); ipmi_sdr_get_sensor_type_desc(sensor->sensor.type));
@ -575,7 +584,7 @@ ipmi_sensor_list(struct ipmi_intf * intf)
itr = ipmi_sdr_start(intf); itr = ipmi_sdr_start(intf);
if (!itr) if (!itr)
{ {
printf("Unable to open SDRR for reading\n"); printf("Unable to open SDR for reading\n");
return; return;
} }
@ -599,7 +608,7 @@ ipmi_sensor_list(struct ipmi_intf * intf)
ipmi_sdr_end(intf, itr); ipmi_sdr_end(intf, itr);
} }
const struct valstr threshold_vals[] = { static const struct valstr threshold_vals[] = {
{ UPPER_NON_RECOV_SPECIFIED, "Upper Non-Recoverable" }, { UPPER_NON_RECOV_SPECIFIED, "Upper Non-Recoverable" },
{ UPPER_CRIT_SPECIFIED, "Upper Critical" }, { UPPER_CRIT_SPECIFIED, "Upper Critical" },
{ UPPER_NON_CRIT_SPECIFIED, "Upper Non-Critical" }, { UPPER_NON_CRIT_SPECIFIED, "Upper Non-Critical" },
@ -682,7 +691,8 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv)
else else
{ {
printf("Setting sensor \"%s\" %s threshold to %.3f\n", printf("Setting sensor \"%s\" %s threshold to %.3f\n",
sdr->record.full->id_string, val2str(settingMask, threshold_vals), setting); sdr->record.full->id_string,
val2str(settingMask, threshold_vals), setting);
rsp = ipmi_sensor_set_sensor_thresholds(intf, rsp = ipmi_sensor_set_sensor_thresholds(intf,
sdr->record.full->keys.sensor_num, settingMask, sdr->record.full->keys.sensor_num, settingMask,
sdr_convert_sensor_value_to_raw(sdr->record.full, setting)); sdr_convert_sensor_value_to_raw(sdr->record.full, setting));
@ -694,14 +704,12 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv)
{ {
printf("Sensor data record not found!\n"); printf("Sensor data record not found!\n");
} }
ipmi_sdr_list_empty(intf);
} }
static void ipmi_sensor_get(struct ipmi_intf * intf, int argc, char ** argv) static void ipmi_sensor_get(struct ipmi_intf * intf, int argc, char ** argv)
{ {
struct sdr_record_list * sdr; struct sdr_record_list * sdr;
int i; int i, v;
if (argc < 1 || !strncmp(argv[0], "help", 4)) { if (argc < 1 || !strncmp(argv[0], "help", 4)) {
printf("sensor get <id> ... [id]\n"); printf("sensor get <id> ... [id]\n");
@ -714,7 +722,8 @@ static void ipmi_sensor_get(struct ipmi_intf * intf, int argc, char ** argv)
for (i=0; i<argc; i++) { for (i=0; i<argc; i++) {
sdr = ipmi_sdr_find_sdr_byid(intf, argv[i]); sdr = ipmi_sdr_find_sdr_byid(intf, argv[i]);
if (sdr) { if (sdr) {
verbose = verbose ? : 1; v = verbose;
verbose = 1;
switch (sdr->type) { switch (sdr->type) {
case SDR_RECORD_TYPE_FULL_SENSOR: case SDR_RECORD_TYPE_FULL_SENSOR:
ipmi_sensor_print_full(intf, sdr->record.full); ipmi_sensor_print_full(intf, sdr->record.full);
@ -732,12 +741,11 @@ static void ipmi_sensor_get(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_sdr_print_mc_locator(intf, sdr->record.mcloc); ipmi_sdr_print_mc_locator(intf, sdr->record.mcloc);
break; break;
} }
verbose = v;
} else { } else {
printf("Sensor data record \"%s\" not found!\n", argv[i]); printf("Sensor data record \"%s\" not found!\n", argv[i]);
} }
} }
ipmi_sdr_list_empty(intf);
} }
int int