Remove unnecessary `if (x)` tests before calling `free(x)`; free(3)

already employs this check

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division

diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 7242aa4b68df090229cf76865078721c01982775..a194ba6c77ccba48b483b34d9585dc9ac930c164 100644 (file)
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -636,13 +636,10 @@ rpc_broadcast_exp(rpcprog_t prog, rpcvers_t vers, rpcproc_t proc,
        }                       /* The giant for loop */
 
 done_broad:
-       if (inbuf)
-               (void) free(inbuf);
-       if (outbuf)
-               (void) free(outbuf);
+       free(inbuf);
+       free(outbuf);
 #ifdef PORTMAP
-       if (outbuf_pmap)
-               (void) free(outbuf_pmap);
+       free(outbuf_pmap);
 #endif                         /* PORTMAP */
        for (i = 0; i < fdlistno; i++) {
                (void)_close(fdlist[i].fd);

diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index e463165069dd7f621c8c0d0be3a27d0c8eab5a95..aa16b9690a0b9d1099e8d839f0ee8350021c778a 100644 (file)
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -651,8 +651,7 @@ clnt_vc_destroy(CLIENT *cl)
                (void)_close(ct->ct_fd);
        }
        XDR_DESTROY(&(ct->ct_xdrs));
-       if (ct->ct_addr.buf)
-               free(ct->ct_addr.buf);
+       free(ct->ct_addr.buf);
        mem_free(ct, sizeof(struct ct_data));
        if (cl->cl_netid && cl->cl_netid[0])
                mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);

diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index c1e22da52e46873e311de212735911600b92b932..6d668bf5c2fc85be398069634c1146e7f166656c 100644 (file)
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -164,8 +164,7 @@ __nc_error(void)
        if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) {
                nc_addr = (int *)malloc(sizeof (int));
                if (thr_setspecific(nc_key, (void *) nc_addr) != 0) {
-                       if (nc_addr)
-                               free(nc_addr);
+                       free(nc_addr);
                        return (&nc_error);
                }
                *nc_addr = 0;
@@ -417,7 +416,7 @@ endnetconfig(void *handlep)
 
     while (q != NULL) {
        p = q->next;
-       if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
+       free(q->ncp->nc_lookups);
        free(q->ncp);
        free(q->linep);
        free(q);
@@ -537,8 +536,7 @@ freenetconfigent(struct netconfig *netconfigp)
 {
     if (netconfigp != NULL) {
        free(netconfigp->nc_netid);     /* holds all netconfigp's strings */
-       if (netconfigp->nc_lookups != NULL)
-           free(netconfigp->nc_lookups);
+       free(netconfigp->nc_lookups);
        free(netconfigp);
     }
     return;
@@ -628,8 +626,7 @@ parse_ncp(char *stringp, struct netconfig *ncp)
     } else {
        char *cp;           /* tmp string */
 
-       if (ncp->nc_lookups != NULL)    /* from last visit */
-           free(ncp->nc_lookups);
+       free(ncp->nc_lookups); /* from last visit */
        ncp->nc_lookups = NULL;
        ncp->nc_nlookups = 0;
        while ((cp = tokenp) != NULL) {

diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
index 2e17c27f444c266dc99011ee1c80edd316fd24a4..0ec4d8a8b79db1b3b9b9bcea075f7ef091ec27ef 100644 (file)
--- a/lib/libc/rpc/mt_misc.c
+++ b/lib/libc/rpc/mt_misc.c
@@ -106,8 +106,7 @@ __rpc_createerr(void)
                rce_addr = (struct rpc_createerr *)
                        malloc(sizeof (struct rpc_createerr));
                if (thr_setspecific(rce_key, (void *) rce_addr) != 0) {
-                       if (rce_addr)
-                               free(rce_addr);
+                       free(rce_addr);
                        return (&rpc_createerr);
                }
                memset(rce_addr, 0, sizeof (struct rpc_createerr));

diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 8fc91ffde304add0194e6ad827803194e5b279e0..11fc80302a12f60b7b2d7f82d077dcb77d1d1f68 100644 (file)
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -432,8 +432,7 @@ clntunix_create(struct sockaddr_un *raddr, u_long prog, u_long vers, int *sockp,
        if ((raddr->sun_len == 0) ||
           ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
           ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
-               if (svcaddr != NULL)
-                       free(svcaddr);
+               free(svcaddr);
                rpc_createerr.cf_stat = RPC_SYSTEMERROR;
                rpc_createerr.cf_error.re_errno = errno;
                return(cl);

diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index d53d908fc2e421157125b6278e0e3a8789a49eef..49300ed37db0b1628d3ac4b503fc1a302670d7d7 100644 (file)
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -179,8 +179,7 @@ delete_cache(struct netbuf *addr)
                        free(cptr->ac_netid);
                        free(cptr->ac_taddr->buf);
                        free(cptr->ac_taddr);
-                       if (cptr->ac_uaddr)
-                               free(cptr->ac_uaddr);
+                       free(cptr->ac_uaddr);
                        if (prevptr)
                                prevptr->ac_next = cptr->ac_next;
                        else
@@ -216,14 +215,10 @@ add_cache(const char *host, const char *netid, struct netbuf *taddr,
        ad_cache->ac_taddr->buf = (char *) malloc(taddr->len);
        if (ad_cache->ac_taddr->buf == NULL) {
 out:
-               if (ad_cache->ac_host)
-                       free(ad_cache->ac_host);
-               if (ad_cache->ac_netid)
-                       free(ad_cache->ac_netid);
-               if (ad_cache->ac_uaddr)
-                       free(ad_cache->ac_uaddr);
-               if (ad_cache->ac_taddr)
-                       free(ad_cache->ac_taddr);
+               free(ad_cache->ac_host);
+               free(ad_cache->ac_netid);
+               free(ad_cache->ac_uaddr);
+               free(ad_cache->ac_taddr);
                free(ad_cache);
                return;
        }
@@ -256,8 +251,7 @@ out:
                free(cptr->ac_netid);
                free(cptr->ac_taddr->buf);
                free(cptr->ac_taddr);
-               if (cptr->ac_uaddr)
-                       free(cptr->ac_uaddr);
+               free(cptr->ac_uaddr);
 
                if (prevptr) {
                        prevptr->ac_next = NULL;
@@ -798,10 +792,8 @@ __rpcb_findaddr_timed(rpcprog_t program, rpcvers_t version,
                        malloc(remote.len)) == NULL)) {
                        rpc_createerr.cf_stat = RPC_SYSTEMERROR;
                        clnt_geterr(client, &rpc_createerr.cf_error);
-                       if (address) {
-                               free(address);
-                               address = NULL;
-                       }
+                       free(address);
+                       address = NULL;
                        goto error;
                }
                memcpy(address->buf, remote.buf, remote.len);

diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 38cbb797f83e21b0761811ada3be735f0d4cf68c..d68fa9f833194942b209e52c38fbed1f855596c0 100644 (file)
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -198,8 +198,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t prog, const rpcvers_t vers,
 
        rwlock_wrlock(&svc_lock);
        if ((s = svc_find(prog, vers, &prev, netid)) != NULL) {
-               if (netid)
-                       free(netid);
+               free(netid);
                if (s->sc_dispatch == dispatch)
                        goto rpcb_it; /* he is registering another xptr */
                rwlock_unlock(&svc_lock);
@@ -207,8 +206,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t prog, const rpcvers_t vers,
        }
        s = mem_alloc(sizeof (struct svc_callout));
        if (s == NULL) {
-               if (netid)
-                       free(netid);
+               free(netid);
                rwlock_unlock(&svc_lock);
                return (FALSE);
        }

diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index 1957d64b4ea3f3eb6278758b97e1ef02d3f23816..5d9baaa81f6668594a6c007f08869e3c0d98fa20 100644 (file)
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -406,8 +406,7 @@ svc_dg_destroy(SVCXPRT *xprt)
                (void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
        if (xprt->xp_ltaddr.buf)
                (void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-       if (xprt->xp_tp)
-               (void) free(xprt->xp_tp);
+       free(xprt->xp_tp);
        svc_xprt_free(xprt);
 }
 

diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index 4713efcfc558a37b6dbf2549bbc7b0c4c3b70cc0..9ce3f8d4efbc54235ab00ecad462b0426d543c77 100644 (file)
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -166,10 +166,8 @@ rpc_reg(rpcprog_t prognum, rpcvers_t versnum, rpcproc_t procnum,
                        if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) ||
                                ((netid = strdup(nconf->nc_netid)) == NULL)) {
                                warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str);
-                               if (xdrbuf != NULL)
-                                       free(xdrbuf);
-                               if (netid != NULL)
-                                       free(netid);
+                               free(xdrbuf);
+                               free(netid);
                                SVC_DESTROY(svcxprt);
                                break;
                        }

diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index ca4b93e4fbf7c0c57f0bc0d19a450f476589262a..bafb725696f274d7683b811a3146ec6dadf06292 100644 (file)
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -394,10 +394,8 @@ __svc_vc_dodestroy(SVCXPRT *xprt)
                mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
        if (xprt->xp_ltaddr.buf)
                mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-       if (xprt->xp_tp)
-               free(xprt->xp_tp);
-       if (xprt->xp_netid)
-               free(xprt->xp_netid);
+       free(xprt->xp_tp);
+       free(xprt->xp_netid);
        svc_xprt_free(xprt);
 }