Avoid use of "register" as optimization hint.

[thirdparty/glibc.git] / io / fts.c

diff --git a/io/fts.c b/io/fts.c
index 532743fb3e011145b0f30f9d81acf316f6008e3a..c9c054d6d36ab20f3d575bed9b1ab86b0aa0dc4a 100644 (file)
--- a/io/fts.c
+++ b/io/fts.c
@@ -87,12 +87,12 @@ static int      fts_safe_changedir (FTS *, FTSENT *, int, const char *)
 FTS *
 fts_open(argv, options, compar)
        char * const *argv;
-       register int options;
+       int options;
        int (*compar) (const FTSENT **, const FTSENT **);
 {
-       register FTS *sp;
-       register FTSENT *p, *root;
-       register int nitems;
+       FTS *sp;
+       FTSENT *p, *root;
+       int nitems;
        FTSENT *parent = NULL;
        FTSENT *tmp;
 
@@ -204,10 +204,10 @@ static void
 internal_function
 fts_load(sp, p)
        FTS *sp;
-       register FTSENT *p;
+       FTSENT *p;
 {
-       register int len;
-       register char *cp;
+       int len;
+       char *cp;
 
        /*
         * Load the stream structure for the next traversal.  Since we don't
@@ -231,7 +231,7 @@ int
 fts_close(sp)
        FTS *sp;
 {
-       register FTSENT *freep, *p;
+       FTSENT *freep, *p;
        int saved_errno;
 
        /*
@@ -283,11 +283,11 @@ fts_close(sp)
 
 FTSENT *
 fts_read(sp)
-       register FTS *sp;
+       FTS *sp;
 {
-       register FTSENT *p, *tmp;
-       register int instr;
-       register char *t;
+       FTSENT *p, *tmp;
+       int instr;
+       char *t;
        int saved_errno;
 
        /* If finished or unrecoverable error, return NULL. */
@@ -376,12 +376,14 @@ fts_read(sp)
                }
                p = sp->fts_child;
                sp->fts_child = NULL;
+               sp->fts_cur = p;
                goto name;
        }
 
        /* Move to the next node on this level. */
 next:  tmp = p;
        if ((p = p->fts_link) != NULL) {
+               sp->fts_cur = p;
                free(tmp);
 
                /*
@@ -394,7 +396,7 @@ next:       tmp = p;
                                return (NULL);
                        }
                        fts_load(sp, p);
-                       return (sp->fts_cur = p);
+                       return p;
                }
 
                /*
@@ -420,11 +422,12 @@ next:     tmp = p;
 name:          t = sp->fts_path + NAPPEND(p->fts_parent);
                *t++ = '/';
                memmove(t, p->fts_name, p->fts_namelen + 1);
-               return (sp->fts_cur = p);
+               return p;
        }
 
        /* Move up to the parent node. */
        p = tmp->fts_parent;
+       sp->fts_cur = p;
        free(tmp);
 
        if (p->fts_level == FTS_ROOTPARENTLEVEL) {
@@ -465,7 +468,7 @@ name:               t = sp->fts_path + NAPPEND(p->fts_parent);
                return (NULL);
        }
        p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-       return (sp->fts_cur = p);
+       return p;
 }
 
 /*
@@ -492,10 +495,10 @@ fts_set(sp, p, instr)
 
 FTSENT *
 fts_children(sp, instr)
-       register FTS *sp;
+       FTS *sp;
        int instr;
 {
-       register FTSENT *p;
+       FTSENT *p;
        int fd;
 
        if (instr != 0 && instr != FTS_NAMEONLY) {
@@ -575,12 +578,12 @@ fts_children(sp, instr)
 static FTSENT *
 internal_function
 fts_build(sp, type)
-       register FTS *sp;
+       FTS *sp;
        int type;
 {
-       register struct dirent *dp;
-       register FTSENT *p, *head;
-       register int nitems;
+       struct dirent *dp;
+       FTSENT *p, *head;
+       int nitems;
        FTSENT *cur, *tail;
        DIR *dirp;
        void *oldaddr;
@@ -745,20 +748,17 @@ mem1:                             saved_errno = errno;
                        p->fts_flags |= FTS_ISW;
 #endif
 
-#if 0
                /* Unreachable code.  cderrno is only ever set to a nonnull
                   value if dirp is closed at the same time.  But then we
                   cannot enter this loop.  */
-               if (cderrno) {
+               if (0 && cderrno) {
                        if (nlinks) {
                                p->fts_info = FTS_NS;
                                p->fts_errno = cderrno;
                        } else
                                p->fts_info = FTS_NSOK;
                        p->fts_accpath = cur->fts_accpath;
-               } else
-#endif
-               if (nlinks == 0
+               } else if (nlinks == 0
 #if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
                           || (nostat &&
                               dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
@@ -848,12 +848,12 @@ static u_short
 internal_function
 fts_stat(sp, p, follow)
        FTS *sp;
-       register FTSENT *p;
+       FTSENT *p;
        int follow;
 {
-       register FTSENT *t;
-       register dev_t dev;
-       register ino_t ino;
+       FTSENT *t;
+       dev_t dev;
+       ino_t ino;
        struct stat *sbp, sb;
        int saved_errno;
 
@@ -933,9 +933,9 @@ internal_function
 fts_sort(sp, head, nitems)
        FTS *sp;
        FTSENT *head;
-       register int nitems;
+       int nitems;
 {
-       register FTSENT **ap, *p;
+       FTSENT **ap, *p;
 
        /*
         * Construct an array of pointers to the structures and call qsort(3).
@@ -973,7 +973,7 @@ fts_alloc(sp, name, namelen)
        const char *name;
        size_t namelen;
 {
-       register FTSENT *p;
+       FTSENT *p;
        size_t len;
 
        /*
@@ -1009,9 +1009,9 @@ fts_alloc(sp, name, namelen)
 static void
 internal_function
 fts_lfree(head)
-       register FTSENT *head;
+       FTSENT *head;
 {
-       register FTSENT *p;
+       FTSENT *p;
 
        /* Free a linked list of structures. */
        while ((p = head)) {