diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:42:54 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-04-14 18:42:54 +0200 |
| commit | a8f1f2fbd1fe78c185b5c320c11d0265b49f8668 (patch) | |
| tree | 869216c945841ed46e2ca4b69af46f54a738d3cd /util/oem_dell.c | |
| parent | 42de6cdd540e080b6e34e5e27cb8c44151711010 (diff) | |
| parent | c0cffd791bfaffaad631076141fcdfc000adcac1 (diff) | |
Merge tag 'upstream/3.0.4'
Upstream version 3.0.4
Diffstat (limited to 'util/oem_dell.c')
| -rw-r--r-- | util/oem_dell.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/util/oem_dell.c b/util/oem_dell.c index f8caf9a..4f9a7ab 100644 --- a/util/oem_dell.c +++ b/util/oem_dell.c @@ -132,7 +132,7 @@ char NIC_Selection_Mode_String_12g[] [50] = { "shared with failover all loms" }; -static char * progver = "3.03"; +static char * progver = "3.04"; static char * progname = "idelloem"; static int verbose = 0; static char fdebug = 0; @@ -4476,10 +4476,9 @@ static int ipmi_print_power_cap(void* intf,uint8_t unit ) tempbtuphrconv=watt_to_btuphr_conversion(ipmipowercap.PowerCap); printf ("Power cap : %ld BTU/hr\n",tempbtuphrconv); }else{ - - printf ("Maximum power: %ld Watt\n",ipmipowercap.MaximumPowerConsmp); - printf ("Minimum power: %ld Watt\n",ipmipowercap.MinimumPowerConsmp); - printf ("Power cap : %ld Watt\n",ipmipowercap.PowerCap); + printf ("Maximum power: %d Watt\n",ipmipowercap.MaximumPowerConsmp); + printf ("Minimum power: %d Watt\n",ipmipowercap.MinimumPowerConsmp); + printf ("Power cap : %d Watt\n",ipmipowercap.PowerCap); } } return rc; @@ -5676,8 +5675,8 @@ char * get_dell_evt_desc(uchar *sel_rec, int *psev) { if(0x51 == version) { - snprintf(tmpdesc, SIZE_OF_DESC, "DIMM %s", ('A'+ data3)); - strcat(desc, tmpdesc); + snprintf(tmpdesc, SIZE_OF_DESC, "DIMM %c", (char)('A'+ data3)); + strcat(desc, tmpdesc); } else if( ((data2 >> 4) > 0x07) && ((data2 >> 4) != 0x0F)) { |