From 1d3a7ff50a67c7cebcb8d5a7be571d221ff8d09b Mon Sep 17 00:00:00 2001 From: Carol Hebert Date: Tue, 10 Jun 2008 21:48:28 +0000 Subject: [PATCH] Nit fixes: strncmp length fixes, usage info fixes/additions, spelling and white space fixes --- ipmitool/lib/ipmi_chassis.c | 2 +- ipmitool/lib/ipmi_ekanalyzer.c | 2 +- ipmitool/lib/ipmi_event.c | 2 +- ipmitool/lib/ipmi_firewall.c | 6 +- ipmitool/lib/ipmi_fru.c | 21 +++- ipmitool/lib/ipmi_lanp.c | 32 ++--- ipmitool/lib/ipmi_mc.c | 2 +- ipmitool/lib/ipmi_picmg.c | 210 ++++++++++++++++----------------- ipmitool/lib/ipmi_raw.c | 4 +- ipmitool/lib/ipmi_sdr.c | 18 +-- ipmitool/lib/ipmi_sel.c | 2 +- 11 files changed, 157 insertions(+), 144 deletions(-) diff --git a/ipmitool/lib/ipmi_chassis.c b/ipmitool/lib/ipmi_chassis.c index a8e6409..6d75a7e 100644 --- a/ipmitool/lib/ipmi_chassis.c +++ b/ipmitool/lib/ipmi_chassis.c @@ -587,7 +587,7 @@ ipmi_chassis_get_bootparam(struct ipmi_intf * intf, char * arg) break; case 4: { - printf( " Boot Info Acknoledge :\n"); + printf( " Boot Info Acknowledge :\n"); if((rsp->data[3]&0x1f) != 0) { if((rsp->data[3]&0x10) == 0x10) diff --git a/ipmitool/lib/ipmi_ekanalyzer.c b/ipmitool/lib/ipmi_ekanalyzer.c index 7849675..fb9734c 100644 --- a/ipmitool/lib/ipmi_ekanalyzer.c +++ b/ipmitool/lib/ipmi_ekanalyzer.c @@ -493,7 +493,7 @@ ipmi_ekanalyzer_main( struct ipmi_intf * intf, int argc, char ** argv ) if ( file_type[type_offset] != ERROR_STATUS ){ if ( file_type[type_offset] != CONFIG_FILE ){ /* because of strlen doesn't count '\0', we need to add 1 byte for - * this caracter to filename size + * this character to filename size */ filename[type_offset] = malloc( strlen(argv[argument_offset]) + 1 - SIZE_OF_FILE_TYPE diff --git a/ipmitool/lib/ipmi_event.c b/ipmitool/lib/ipmi_event.c index b8496ff..79f895e 100644 --- a/ipmitool/lib/ipmi_event.c +++ b/ipmitool/lib/ipmi_event.c @@ -597,7 +597,7 @@ ipmi_event_usage(void) lprintf(LOG_NOTICE, " Use the 'sel save' command to generate from SEL"); lprintf(LOG_NOTICE, ""); lprintf(LOG_NOTICE, "usage: event [event_dir]"); - lprintf(LOG_NOTICE, " sensorid : Sensor ID to use for event data"); + lprintf(LOG_NOTICE, " sensorid : Sensor ID string to use for event data"); lprintf(LOG_NOTICE, " state : Sensor state, use 'list' to see possible states for sensor"); lprintf(LOG_NOTICE, " event_dir : assert, deassert [default=assert]"); lprintf(LOG_NOTICE, ""); diff --git a/ipmitool/lib/ipmi_firewall.c b/ipmitool/lib/ipmi_firewall.c index 0be4022..3e937ea 100644 --- a/ipmitool/lib/ipmi_firewall.c +++ b/ipmitool/lib/ipmi_firewall.c @@ -49,9 +49,9 @@ printf_firewall_usage(void) { printf("Firmware Firewall Commands:\n"); printf("\tinfo [channel H] [lun L]\n"); - printf("\tinfo [channel H] [lun L [netfn N [cmd C [subfn S]]]]\n"); - printf("\tenable [channel H] [lun L [netfn N [cmd C [subfn S]]]]\n"); - printf("\tdisable [channel H] [lun L [netfn N [cmd C [subfn S]]]] [force])\n"); + printf("\tinfo [channel H] [lun L [netfn N [command C [subfn S]]]]\n"); + printf("\tenable [channel H] [lun L [netfn N [command C [subfn S]]]]\n"); + printf("\tdisable [channel H] [lun L [netfn N [command C [subfn S]]]] [force])\n"); printf("\treset [channel H] \n"); printf("\t\twhere H is a Channel, L is a LUN, N is a NetFn,\n"); printf("\t\tC is a Command and S is a Sub-Function\n"); diff --git a/ipmitool/lib/ipmi_fru.c b/ipmitool/lib/ipmi_fru.c index 16f836b..5e762dc 100644 --- a/ipmitool/lib/ipmi_fru.c +++ b/ipmitool/lib/ipmi_fru.c @@ -1119,7 +1119,7 @@ static int ipmi_fru_picmg_ext_edit(uint8_t * fru_data, } - printf(" Module Activation Rediness: %i sec.\n", fru_data[++offset]); + printf(" Module Activation Readiness: %i sec.\n", fru_data[++offset]); printf(" Descriptor Count: %i\n", fru_data[++offset]); printf("\n"); @@ -2801,18 +2801,29 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv) } } else if (!strncmp(argv[0], "edit", 4)) { + + if ((argc >= 2) && (strncmp(argv[1], "help", 4) == 0)) { + lprintf(LOG_ERR, "edit commands:"); + lprintf(LOG_ERR, " edit - interactively edit records"); + lprintf(LOG_ERR, + " edit field
" - edit FRU string); + lprintf(LOG_ERR, + " edit oem iana " - limited OEM support); + } else { + uint8_t fruId = 0; + if ((argc >= 2) && (strlen(argv[1]) > 0)) { fruId = atoi(argv[1]); if (verbose) { printf("Fru Id : %d\n", fruId); } - }else { + } else { printf("Using default FRU id: %d\n", fruId); } if ((argc >= 3) && (strlen(argv[1]) > 0)) { - if (!strncmp(argv[2], "field", 4)){ + if (!strncmp(argv[2], "field", 5)){ if (argc == 6) { ipmi_fru_set_field_string(intf, fruId,\ *argv[3], *argv[4], (char *) argv[5]); @@ -2826,6 +2837,8 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv) } else { ipmi_fru_edit_multirec(intf,fruId, argc, argv); } + + } } else { lprintf(LOG_ERR, "Invalid FRU command: %s", argv[0]); @@ -3005,7 +3018,7 @@ f_type, uint8_t f_index, char *f_string) checksum = (~checksum) + 1; fru_data[header_offset + fru_section_len - 1] = checksum; - /* Write te updated section to the FRU data */ + /* Write the updated section to the FRU data */ if( write_fru_area(intf, &fru, fruId, header_offset, header_offset, fru_section_len, fru_data) < 0 ) { diff --git a/ipmitool/lib/ipmi_lanp.c b/ipmitool/lib/ipmi_lanp.c index 4d7a913..41aec6b 100644 --- a/ipmitool/lib/ipmi_lanp.c +++ b/ipmitool/lib/ipmi_lanp.c @@ -1256,8 +1256,8 @@ get_cmdline_ipaddr(char * arg, uint8_t * buf) static void ipmi_lan_set_usage(void) { - lprintf(LOG_NOTICE, "\nusage: lan set [option]\n"); - lprintf(LOG_NOTICE, "LAN set commands:"); + lprintf(LOG_NOTICE, "\nusage: lan set \n"); + lprintf(LOG_NOTICE, "LAN set command/parameter options:"); lprintf(LOG_NOTICE, " ipaddr Set channel IP address"); lprintf(LOG_NOTICE, " netmask Set channel IP netmask"); lprintf(LOG_NOTICE, " macaddr Set channel MAC address"); @@ -1722,21 +1722,22 @@ ipmi_lan_alert_print_all(struct ipmi_intf * intf, uint8_t channel) static void ipmi_lan_alert_print_usage(void) { - lprintf(LOG_NOTICE, "\nusage: lan alert print [channel] [alert]\n"); + lprintf(LOG_NOTICE, "\nusage: lan alert print [channel number] [alert destination]\n"); lprintf(LOG_NOTICE, "Default will print all alerts for the first found LAN channel"); } static void ipmi_lan_alert_set_usage(void) { - lprintf(LOG_NOTICE, "\nusage: lan alert set