No need to cast NULL when assigning it to a variable;

[mandoc.git] / compat_fts.c

diff --git a/compat_fts.c b/compat_fts.c
index c2cc9570c545b9e99774d320a1b38a25232f9a39..f0a9d4c86e1057819d9d529162d01dd2bf243105 100644 (file)
--- a/compat_fts.c
+++ b/compat_fts.c
@@ -6,7 +6,7 @@ int dummy;
 
 #else
 
-/*     $Id: compat_fts.c,v 1.12 2016/10/18 23:58:12 schwarze Exp $     */
+/*     $Id: compat_fts.c,v 1.13 2017/02/15 15:58:46 schwarze Exp $     */
 /*     $OpenBSD: fts.c,v 1.56 2016/09/21 04:38:56 guenther Exp $       */
 
 /*-
@@ -84,7 +84,7 @@ fts_open(char * const *argv, int options,
        FTS *sp;
        FTSENT *p, *root;
        int nitems;
-       FTSENT *parent, *tmp;
+       FTSENT *parent, *prev;
 
        /* Options check. */
        if (options & ~FTS_OPTIONMASK) {
@@ -117,7 +117,7 @@ fts_open(char * const *argv, int options,
        parent->fts_level = FTS_ROOTPARENTLEVEL;
 
        /* Allocate/initialize root(s). */
-       for (root = NULL, nitems = 0; *argv; ++argv, ++nitems) {
+       for (root = prev = NULL, nitems = 0; *argv; ++argv, ++nitems) {
                if ((p = fts_alloc(sp, *argv, strlen(*argv))) == NULL)
                        goto mem3;
                p->fts_level = FTS_ROOTLEVEL;
@@ -139,11 +139,10 @@ fts_open(char * const *argv, int options,
                } else {
                        p->fts_link = NULL;
                        if (root == NULL)
-                               tmp = root = p;
-                       else {
-                               tmp->fts_link = p;
-                               tmp = p;
-                       }
+                               root = p;
+                       else
+                               prev->fts_link = p;
+                       prev = p;
                }
        }
        if (compar && nitems > 1)