X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fnidlist.c;h=3b04d32acf449171e4eb74f9818cb520581a3cd0;hb=393350b37cae30efc03ffc076c77e390999c2a2d;hp=78e70ce10882ee38ce065a411e151d4122ee68d6;hpb=a926e593b0c769d20aef191e2b0b6b1d881b6637;p=fs%2Flustre-release.git diff --git a/lustre/utils/nidlist.c b/lustre/utils/nidlist.c index 78e70ce..3b04d32 100644 --- a/lustre/utils/nidlist.c +++ b/lustre/utils/nidlist.c @@ -209,20 +209,24 @@ static char *nl_nid_lookup_ipaddr(char *nid) if ((p = strchr(name, '.'))) *p = '\0'; len = strlen(name) + 2; - if (lnet) + if (lnet != NULL) len += strlen(lnet); - if (!(res = malloc(len))) - nl_oom(); - snprintf(res, len, "%s@%s", name, lnet); - break; - } - } - freeaddrinfo(ai); - } - } - free(addr); + if (!(res = malloc(len))) + nl_oom(); + if (lnet != NULL) + snprintf(res, len, "%s@%s", + name, lnet); + else + snprintf(res, len, "%s", name); + break; + } + } + freeaddrinfo(ai); + } + } + free(addr); - return res; + return res; } void nl_lookup_ip(NIDList nl)