summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortruckman <truckman@FreeBSD.org>2016-05-13 00:50:53 +0000
committertruckman <truckman@FreeBSD.org>2016-05-13 00:50:53 +0000
commit6eda2ae91cdd77e9ffd63d3214eedb616a5b480f (patch)
tree9c9bba334680d4ff5d76fdd119b2c2a0b5a490a2
parent61eb4d5d8afa53a504d7065b957da20e85fc4878 (diff)
downloadFreeBSD-src-6eda2ae91cdd77e9ffd63d3214eedb616a5b480f.zip
FreeBSD-src-6eda2ae91cdd77e9ffd63d3214eedb616a5b480f.tar.gz
Simplify some overly complex code so that both humans and Coverity
have a better chance of understanding it. Reported by: Coverity CID: 1009684, 1006931
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index a12b932..3fdcfd1 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -609,12 +609,13 @@ reply_proc(void *res, struct netbuf *who, struct netconfig *nconf)
} else {
hostname = hostbuf;
}
- if (!(uaddr = taddr2uaddr(nconf, who))) {
- uaddr = UNKNOWN;
- }
- printf("%s\t%s\n", uaddr, hostname);
- if (strcmp(uaddr, UNKNOWN))
+ uaddr = taddr2uaddr(nconf, who);
+ if (uaddr == NULL) {
+ printf("%s\t%s\n", UNKNOWN, hostname);
+ } else {
+ printf("%s\t%s\n", uaddr, hostname);
free((char *)uaddr);
+ }
return (FALSE);
}
OpenPOWER on IntegriCloud