fixed type for oemval2str (shouldn't be 16 bits for a 24 bits iana ..)

This commit is contained in:
Francois Isabelle 2007-12-14 20:56:53 +00:00
parent 8aad659697
commit 6e4a63bdfe
3 changed files with 5 additions and 5 deletions

View File

@ -63,7 +63,7 @@ struct oemvalstr {
};
const char * val2str(uint16_t val, const struct valstr * vs);
const char * oemval2str(uint16_t oem,uint16_t val, const struct oemvalstr * vs);
const char * oemval2str(uint32_t oem,uint16_t val, const struct oemvalstr * vs);
uint16_t str2val(const char * str, const struct valstr * vs);
void print_valstr(const struct valstr * vs, const char * title, int loglevel);
void print_valstr_2col(const struct valstr * vs, const char * title, int loglevel);

View File

@ -123,8 +123,8 @@ const char * val2str(uint16_t val, const struct valstr *vs)
return un_str;
}
const char * oemval2str(uint16_t oem, uint16_t val,
const char * oemval2str(uint32_t oem, uint16_t val,
const struct oemvalstr *vs)
{
static char un_str[32];

View File

@ -315,7 +315,7 @@ ipmi_mc_get_deviceid(struct ipmi_intf * intf)
struct ipmi_rq req;
struct ipm_devid_rsp *devid;
int i;
char *product=NULL;
const char *product=NULL;
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_APP;
@ -353,7 +353,7 @@ ipmi_mc_get_deviceid(struct ipmi_intf * intf)
printf("Product ID : %u (0x%02x%02x)\n",
buf2short((uint8_t *)(devid->product_id)),
devid->product_id[1], devid->product_id[0]);
product=oemval2str(IPM_DEV_MANUFACTURER_ID(devid->manufacturer_id),
(devid->product_id[1]<<8)+devid->product_id[0],
ipmi_oem_product_info);