Remove NULL-checks before free() and a few related dead assignments.

ok and valuable input from millert@

2 files changed, 5 insertions, 8 deletions

diff --git a/src/lib/libc/net/freeaddrinfo.c b/src/lib/libc/net/freeaddrinfo.c
index 5efb97db92..2ac84a31f3 100644
--- a/src/lib/libc/net/freeaddrinfo.c
+++ b/src/lib/libc/net/freeaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: freeaddrinfo.c,v 1.7 2015/09/14 07:38:38 guenther Exp $       */
+/*      $OpenBSD: freeaddrinfo.c,v 1.8 2015/12/28 22:08:18 mmcc Exp $   */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 1999, Craig Metz, All rights reserved.
@@ -43,8 +43,7 @@ freeaddrinfo(struct addrinfo *ai)
         do {
                 p = ai;
                 ai = ai->ai_next;
-                if (p->ai_canonname)
-                        free(p->ai_canonname);
+                free(p->ai_canonname);
                 free((void *)p);
         } while (ai);
 }
diff --git a/src/lib/libc/stdlib/ecvt.c b/src/lib/libc/stdlib/ecvt.c
index a0bbbec073..dfcf45fe6c 100644
--- a/src/lib/libc/stdlib/ecvt.c
+++ b/src/lib/libc/stdlib/ecvt.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ecvt.c,v 1.9 2015/08/20 21:49:29 deraadt Exp $        */
+/*      $OpenBSD: ecvt.c,v 1.10 2015/12/28 22:08:18 mmcc Exp $  */
 
 /*
  * Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -40,10 +40,8 @@ __cvt(double value, int ndigit, int *decpt, int *sign, int fmode, int pad)
                 return ("");
         }
 
-        if (s) {
-                free(s);
-                s = NULL;
-        }
+        free(s);
+        s = NULL;
 
         if (ndigit < 0)
                 siz = -ndigit + 1;