[PATCH 2/3] fsck(8): no need to check for NULL before free(3)

[Benjamin Baier]

No need to check for NULL before free(3)

Fri May 29 10:59:23 CEST 2015
/git/hellfish/src/sbin/fsck
Index: fsck.c
===================================================================
RCS file: /cvs/src/sbin/fsck/fsck.c,v
retrieving revision 1.35
diff -u -p -r1.35 fsck.c
--- fsck.c      18 Apr 2015 18:28:37 -0000      1.35
+++ fsck.c      29 May 2015 08:59:01 -0000
@@ -287,8 +287,7 @@ checkfs(const char *vfstype, const char
        switch (pid = fork()) {
        case -1:                                /* Error. */
                warn("fork");
-               if (optbuf)
-                       free(optbuf);
+               free(optbuf);
                free(argv);
                return (1);

@@ -320,8 +319,7 @@ checkfs(const char *vfstype, const char
                /* NOTREACHED */

        default:                                /* Parent. */
-               if (optbuf)
-                       free(optbuf);
+               free(optbuf);
                free(argv);

                if (pidp) {
@@ -439,7 +437,7 @@ catopt(char *s0, const char *s1, int fr)
        } else
                cp = estrdup(s1);

-       if (s0 && fr)
+       if (fr)
                free(s0);
        return (cp);
 }

--- fsutil.c.p1 Fri May 29 11:01:25 2015
+++ fsutil.c    Fri May 29 11:02:18 2015
@@ -258,8 +258,7 @@ ereallocarray(void *p, size_t n, size_t s)
        }
        newp = reallocarray(p, n, s);
        if (newp == NULL) {
-               if (p)
-                       free(p);
+               free(p);
                err(1, "reallocarray failed");
        }
        return newp;