Relicensed dump/restore under the revised BSD license, as per ftp://ftp.cs.berkeley...

[dump.git] / compat / lib / compatglob.c

diff --git a/compat/lib/compatglob.c b/compat/lib/compatglob.c
index 4b70101fdea27fab1de9056d15555217fe13aa96..4a83a2f75d07df75fc65d9e235a6eb45635bc176 100644 (file)
--- a/compat/lib/compatglob.c
+++ b/compat/lib/compatglob.c
@@ -21,11 +21,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -69,7 +65,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: compatglob.c,v 1.7 2002/01/16 09:32:14 stelian Exp $";
+       "$Id: compatglob.c,v 1.9 2003/03/30 15:40:35 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -564,7 +560,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pattern, glob_t *pglob)
 static int
 glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern, glob_t *pglob)
 {
-       register struct dirent *dp;
+       struct dirent *dp;
        DIR *dirp;
        int err;
        char buf[MAXPATHLEN];
@@ -599,8 +595,8 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern, glob_t *pg
        else
                readdirfunc = readdir;
        while ((dp = (*readdirfunc)(dirp))) {
-               register u_char *sc;
-               register Char *dc;
+               u_char *sc;
+               Char *dc;
 
                /* Initial DOT must be matched literally. */
                if (dp->d_name[0] == DOT && *pattern != DOT)
@@ -642,8 +638,8 @@ glob3(Char *pathbuf, Char *pathend, Char *pattern, Char *restpattern, glob_t *pg
 static int
 globextend(const Char *path, glob_t *pglob)
 {
-       register char **pathv;
-       register int i;
+       char **pathv;
+       int i;
        u_int newsize;
        char *copy;
        const Char *p;
@@ -727,8 +723,8 @@ match(Char *name, Char *pat, Char *patend)
 void
 globfree(glob_t *pglob)
 {
-       register int i;
-       register char **pp;
+       int i;
+       char **pp;
 
        if (pglob->gl_pathv != NULL) {
                pp = pglob->gl_pathv + pglob->gl_offs;
@@ -806,7 +802,7 @@ g_strcat(Char *dst, const Char *src)
 static void
 g_Ctoc(const Char *str, char *buf)
 {
-       register char *dc;
+       char *dc;
 
        for (dc = buf; (*dc++ = *str++) != EOS;)
                continue;
@@ -816,7 +812,7 @@ g_Ctoc(const Char *str, char *buf)
 static void
 qprintf(const char *str, Char *s)
 {
-       register Char *p;
+       Char *p;
 
        (void)printf("%s:\n", str);
        for (p = s; *p; p++)