From e8156f1505d6cb48016cc4e19cc49dfc81ca5b26 Mon Sep 17 00:00:00 2001 From: Duncan Idaho Date: Sat, 28 Apr 2012 07:19:15 +0000 Subject: [PATCH 17/18] lib/ipmi_picmg.c - unnecessary IPMI dev query Signed-off-by: Duncan Idaho Commit moves argc/help check up in the code, resp. in ipmi_picmg_main(), to avoid unnecessary query to IPMI dev. It doesn't make sense to query IPMI device only to print help and terminate immediately. --- lib/ipmi_picmg.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c index c897ecc..bd462cf 100644 --- a/lib/ipmi_picmg.c +++ b/lib/ipmi_picmg.c @@ -1281,19 +1281,19 @@ ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv) int rc = 0; int showProperties = 0; + if (argc == 0 || (!strncmp(argv[0], "help", 4))) { + ipmi_picmg_help(); + return 0; + } + /* Get PICMG properties is called to obtain version information */ if (argc !=0 && !strncmp(argv[0], "properties", 10)) { showProperties =1; } rc = ipmi_picmg_properties(intf,showProperties); - if (argc == 0 || (!strncmp(argv[0], "help", 4))) { - ipmi_picmg_help(); - return 0; - } - /* address info command */ - else if (!strncmp(argv[0], "addrinfo", 8)) { + if (!strncmp(argv[0], "addrinfo", 8)) { rc = ipmi_picmg_getaddr(intf, argc-1, &argv[1]); } else if (!strncmp(argv[0], "busres", 6)) { -- 1.7.5.1