Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Stick UFS_ in front of these symbols:



details:   https://anonhg.NetBSD.org/src/rev/2482b35cdfb0
branches:  trunk
changeset: 787291:2482b35cdfb0
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jun 09 17:57:08 2013 +0000

description:
Stick UFS_ in front of these symbols:
   DIRBLKSIZ
   DIRECTSIZ
   DIRSIZ
   OLDDIRFMT
   NEWDIRFMT

Part of PR 47909.

diffstat:

 sbin/fsck_ext2fs/dir.c    |  10 +++++-----
 sbin/fsck_ffs/dir.c       |  20 ++++++++++----------
 sbin/fsck_ffs/pass2.c     |  10 +++++-----
 sbin/fsck_ffs/setup.c     |   6 +++---
 sbin/fsdb/fsdb.c          |   6 +++---
 sbin/restore/dirs.c       |  18 +++++++++---------
 sys/lib/libsa/ufs.c       |   4 ++--
 sys/ufs/ffs/ffs_vfsops.c  |   8 ++++----
 sys/ufs/ufs/dir.h         |  36 ++++++++++++++++++------------------
 sys/ufs/ufs/dirhash.h     |   4 ++--
 sys/ufs/ufs/ufs_dirhash.c |  28 ++++++++++++++--------------
 sys/ufs/ufs/ufs_extattr.c |  16 ++++++++--------
 sys/ufs/ufs/ufs_lookup.c  |  22 +++++++++++-----------
 sys/ufs/ufs/ufs_rename.c  |   8 ++++----
 sys/ufs/ufs/ufs_vnops.c   |   8 ++++----
 usr.sbin/makefs/ffs.c     |  26 +++++++++++++-------------
 16 files changed, 115 insertions(+), 115 deletions(-)

diffs (truncated from 845 to 300 lines):

diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/fsck_ext2fs/dir.c
--- a/sbin/fsck_ext2fs/dir.c    Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/fsck_ext2fs/dir.c    Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.26 2013/01/22 09:39:11 dholland Exp $        */
+/*     $NetBSD: dir.c,v 1.27 2013/06/09 17:57:09 dholland Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c      8.5 (Berkeley) 12/8/94";
 #else
-__RCSID("$NetBSD: dir.c,v 1.26 2013/01/22 09:39:11 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.27 2013/06/09 17:57:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -84,7 +84,7 @@
 int    lfmode = 01700;
 struct ext2fs_dirtemplate emptydir = {
        .dot_ino = 0,
-       .dot_reclen = DIRBLKSIZ,
+       .dot_reclen = UFS_DIRBLKSIZ,
 }; 
 struct ext2fs_dirtemplate dirhead = {
        .dot_ino = 0,
@@ -93,12 +93,12 @@
        .dot_type = EXT2_FT_DIR,
        .dot_name = ".",
        .dotdot_ino = 0,
-       .dotdot_reclen = DIRBLKSIZ - 12,
+       .dotdot_reclen = UFS_DIRBLKSIZ - 12,
        .dotdot_namlen = 2,
        .dotdot_type = EXT2_FT_DIR,
        .dotdot_name = "..",
 };
-#undef DIRBLKSIZ
+#undef UFS_DIRBLKSIZ
 
 static int expanddir(struct ext2fs_dinode *, char *);
 static void freedir(ino_t, ino_t);
diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/fsck_ffs/dir.c
--- a/sbin/fsck_ffs/dir.c       Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/fsck_ffs/dir.c       Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.c,v 1.54 2013/01/22 09:39:11 dholland Exp $        */
+/*     $NetBSD: dir.c,v 1.55 2013/06/09 17:57:09 dholland Exp $        */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dir.c      8.8 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dir.c,v 1.54 2013/01/22 09:39:11 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.55 2013/06/09 17:57:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@
 ino_t  lfdir;
 struct dirtemplate emptydir = {
        .dot_ino = 0,
-       .dot_reclen = DIRBLKSIZ,
+       .dot_reclen = UFS_DIRBLKSIZ,
 };
 struct dirtemplate dirhead = {
        .dot_ino = 0,
@@ -68,7 +68,7 @@
        .dot_namlen = 1,
        .dot_name = ".",
        .dotdot_ino = 0,
-       .dotdot_reclen = DIRBLKSIZ - 12,
+       .dotdot_reclen = UFS_DIRBLKSIZ - 12,
        .dotdot_type = DT_DIR,
        .dotdot_namlen = 2,
        .dotdot_name = "..",
@@ -79,7 +79,7 @@
        .dot_namlen = 1,
        .dot_name = ".",
        .dotdot_ino = 0,
-       .dotdot_reclen = DIRBLKSIZ - 12,
+       .dotdot_reclen = UFS_DIRBLKSIZ - 12,
        .dotdot_namlen = 2,
        .dotdot_name = "..",
 };
@@ -154,8 +154,8 @@
        struct bufarea *bp;
        int dsize, n;
        long blksiz;
-#if DIRBLKSIZ > APPLEUFS_DIRBLKSIZ
-       char dbuf[DIRBLKSIZ];
+#if UFS_DIRBLKSIZ > APPLEUFS_DIRBLKSIZ
+       char dbuf[UFS_DIRBLKSIZ];
 #else
        char dbuf[APPLEUFS_DIRBLKSIZ];
 #endif
@@ -324,7 +324,7 @@
                return (0);
        if (dp->d_ino == 0)
                return (1);
-       size = DIRSIZ(!newinofmt, dp, needswap);
+       size = UFS_DIRSIZ(!newinofmt, dp, needswap);
 #      if (BYTE_ORDER == LITTLE_ENDIAN)
                if (!newinofmt && !needswap) {
 #      else
@@ -450,9 +450,9 @@
        int newlen, oldlen;
 
        newent.d_namlen = strlen(idesc->id_name);
-       newlen = DIRSIZ(0, &newent, 0);
+       newlen = UFS_DIRSIZ(0, &newent, 0);
        if (dirp->d_ino != 0)
-               oldlen = DIRSIZ(0, dirp, 0);
+               oldlen = UFS_DIRSIZ(0, dirp, 0);
        else
                oldlen = 0;
        if (iswap16(dirp->d_reclen) - oldlen < newlen)
diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/fsck_ffs/pass2.c
--- a/sbin/fsck_ffs/pass2.c     Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/fsck_ffs/pass2.c     Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass2.c,v 1.49 2013/01/22 09:39:12 dholland Exp $      */
+/*     $NetBSD: pass2.c,v 1.50 2013/06/09 17:57:09 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pass2.c    8.9 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass2.c,v 1.49 2013/01/22 09:39:12 dholland Exp $");
+__RCSID("$NetBSD: pass2.c,v 1.50 2013/06/09 17:57:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -382,7 +382,7 @@
                        proto.d_type = proto.d_namlen;
                        proto.d_namlen = tmp;
                }
-       entrysize = DIRSIZ(0, &proto, 0);
+       entrysize = UFS_DIRSIZ(0, &proto, 0);
        if (dirp->d_ino != 0 && strcmp(dirp->d_name, "..") != 0) {
                pfatal("CANNOT FIX, FIRST ENTRY IN DIRECTORY CONTAINS %s\n",
                        dirp->d_name);
@@ -433,9 +433,9 @@
                proto.d_type = proto.d_namlen;
                proto.d_namlen = tmp;
        }
-       entrysize = DIRSIZ(0, &proto, 0);
+       entrysize = UFS_DIRSIZ(0, &proto, 0);
        if (idesc->id_entryno == 0) {
-               n = DIRSIZ(0, dirp, 0);
+               n = UFS_DIRSIZ(0, dirp, 0);
                if (iswap16(dirp->d_reclen) < n + entrysize)
                        goto chk2;
                proto.d_reclen = iswap16(iswap16(dirp->d_reclen) - n);
diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/fsck_ffs/setup.c
--- a/sbin/fsck_ffs/setup.c     Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/fsck_ffs/setup.c     Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setup.c,v 1.96 2013/01/22 09:39:12 dholland Exp $      */
+/*     $NetBSD: setup.c,v 1.97 2013/06/09 17:57:09 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c    8.10 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: setup.c,v 1.96 2013/01/22 09:39:12 dholland Exp $");
+__RCSID("$NetBSD: setup.c,v 1.97 2013/06/09 17:57:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -534,7 +534,7 @@
        if (readappleufs())
                isappleufs = 1;
 
-       dirblksiz = DIRBLKSIZ;
+       dirblksiz = UFS_DIRBLKSIZ;
        if (isappleufs)
                dirblksiz = APPLEUFS_DIRBLKSIZ;
 
diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/fsdb/fsdb.c
--- a/sbin/fsdb/fsdb.c  Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/fsdb/fsdb.c  Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsdb.c,v 1.45 2013/01/22 09:39:12 dholland Exp $       */
+/*     $NetBSD: fsdb.c,v 1.46 2013/06/09 17:57:09 dholland Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.45 2013/01/22 09:39:12 dholland Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.46 2013/06/09 17:57:09 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -990,7 +990,7 @@
        if (slotcount++ == desired) {
                /* will name fit? */
                testdir.d_namlen = strlen(idesc->id_name);
-               if (DIRSIZ(NEWDIRFMT, &testdir, 0) <= iswap16(dirp->d_reclen)) {
+               if (UFS_DIRSIZ(UFS_NEWDIRFMT, &testdir, 0) <= iswap16(dirp->d_reclen)) {
                        dirp->d_namlen = testdir.d_namlen;
                        strlcpy(dirp->d_name, idesc->id_name,
                            sizeof(dirp->d_name));
diff -r 746dd89fbad9 -r 2482b35cdfb0 sbin/restore/dirs.c
--- a/sbin/restore/dirs.c       Sun Jun 09 17:55:46 2013 +0000
+++ b/sbin/restore/dirs.c       Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dirs.c,v 1.49 2013/01/22 09:39:13 dholland Exp $       */
+/*     $NetBSD: dirs.c,v 1.50 2013/06/09 17:57:09 dholland Exp $       */
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)dirs.c     8.7 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: dirs.c,v 1.49 2013/01/22 09:39:13 dholland Exp $");
+__RCSID("$NetBSD: dirs.c,v 1.50 2013/06/09 17:57:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -184,7 +184,7 @@
        nulldir.d_type = DT_DIR;
        nulldir.d_namlen = 1;
        (void) strcpy(nulldir.d_name, "/");
-       nulldir.d_reclen = DIRSIZ(0, &nulldir, 0);
+       nulldir.d_reclen = UFS_DIRSIZ(0, &nulldir, 0);
        for (;;) {
                curfile.name = "<directory file - name unknown>";
                curfile.action = USING;
@@ -372,16 +372,16 @@
                        i = DIRBLKSIZ - (loc & (DIRBLKSIZ - 1));
                        if ((dp->d_reclen & 0x3) != 0 ||
                            dp->d_reclen > i ||
-                           dp->d_reclen < DIRSIZ(0, dp, 0) /* ||
+                           dp->d_reclen < UFS_DIRSIZ(0, dp, 0) /* ||
                            dp->d_namlen > NAME_MAX */) {
                                vprintf(stdout, "Mangled directory: ");
                                if ((dp->d_reclen & 0x3) != 0)
                                        vprintf(stdout,
                                           "reclen not multiple of 4 ");
-                               if (dp->d_reclen < DIRSIZ(0, dp, 0))
+                               if (dp->d_reclen < UFS_DIRSIZ(0, dp, 0))
                                        vprintf(stdout,
-                                          "reclen less than DIRSIZ (%d < %lu) ",
-                                          dp->d_reclen, (u_long)DIRSIZ(0, dp, 0));
+                                          "reclen less than UFS_DIRSIZ (%d < %lu) ",
+                                          dp->d_reclen, (u_long)UFS_DIRSIZ(0, dp, 0));
 #if 0  /* dp->d_namlen is a uint8_t, always < NAME_MAX */
                                if (dp->d_namlen > NAME_MAX)
                                        vprintf(stdout,
@@ -413,7 +413,7 @@
 static void
 putent(struct direct *dp)
 {
-       dp->d_reclen = DIRSIZ(0, dp, 0);
+       dp->d_reclen = UFS_DIRSIZ(0, dp, 0);
        if (dirloc + dp->d_reclen > DIRBLKSIZ) {
                ((struct direct *)(dirbuf + prev))->d_reclen =
                    DIRBLKSIZ - prev;
@@ -449,7 +449,7 @@
        ndp->d_type = DT_UNKNOWN;
        (void) strncpy(ndp->d_name, odp->d_name, ODIRSIZ);
        ndp->d_namlen = strlen(ndp->d_name);
-       ndp->d_reclen = DIRSIZ(0, ndp, 0);
+       ndp->d_reclen = UFS_DIRSIZ(0, ndp, 0);
 }
 
 /*
diff -r 746dd89fbad9 -r 2482b35cdfb0 sys/lib/libsa/ufs.c
--- a/sys/lib/libsa/ufs.c       Sun Jun 09 17:55:46 2013 +0000
+++ b/sys/lib/libsa/ufs.c       Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs.c,v 1.59 2013/01/22 09:39:14 dholland Exp $        */
+/*     $NetBSD: ufs.c,v 1.60 2013/06/09 17:57:08 dholland Exp $        */
 
 /*-
  * Copyright (c) 1993
@@ -895,7 +895,7 @@
                if (rc)
                        goto out;
                /* some firmware might use block size larger than DEV_BSIZE */
-               if (buf_size < DIRBLKSIZ)
+               if (buf_size < UFS_DIRBLKSIZ)
                        goto out;
 
                dp = (struct direct *)buf;
diff -r 746dd89fbad9 -r 2482b35cdfb0 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Sun Jun 09 17:55:46 2013 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Sun Jun 09 17:57:08 2013 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index