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

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a0df10d0ebe9
branches:  trunk
changeset: 787292:a0df10d0ebe9
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Jun 09 18:29:25 2013 +0000

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

Part of PR 47909.

(two stragglers in this commit; oops)

diffstat:

 sbin/newfs/mkfs.c     |  12 ++++++------
 sys/kern/vfs_getcwd.c |   7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 2482b35cdfb0 -r a0df10d0ebe9 sbin/newfs/mkfs.c
--- a/sbin/newfs/mkfs.c Sun Jun 09 17:57:08 2013 +0000
+++ b/sbin/newfs/mkfs.c Sun Jun 09 18:29:25 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $       */
+/*     $NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $      */
 
 /*
  * Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c     8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mkfs.c,v 1.114 2013/03/17 12:25:36 mlelstv Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.115 2013/06/09 18:29:41 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -1253,14 +1253,14 @@
 {
        char *cp;
        int i, spcleft;
-       int dirblksiz = DIRBLKSIZ;
+       int dirblksiz = UFS_DIRBLKSIZ;
        if (isappleufs)
                dirblksiz = APPLEUFS_DIRBLKSIZ;
 
-       memset(buf, 0, DIRBLKSIZ);
+       memset(buf, 0, UFS_DIRBLKSIZ);
        spcleft = dirblksiz;
        for (cp = buf, i = 0; i < entries - 1; i++) {
-               protodir[i].d_reclen = DIRSIZ(Oflag == 0, &protodir[i], 0);
+               protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, &protodir[i], 0);
                copy_dir(&protodir[i], (struct direct*)cp);
                cp += protodir[i].d_reclen;
                spcleft -= protodir[i].d_reclen;
@@ -1539,7 +1539,7 @@
 static void
 copy_dir(struct direct *dir, struct direct *dbuf)
 {
-       memcpy(dbuf, dir, DIRSIZ(Oflag == 0, dir, 0));
+       memcpy(dbuf, dir, UFS_DIRSIZ(Oflag == 0, dir, 0));
        if (needswap) {
                dbuf->d_ino = bswap32(dir->d_ino);
                dbuf->d_reclen = bswap16(dir->d_reclen);
diff -r 2482b35cdfb0 -r a0df10d0ebe9 sys/kern/vfs_getcwd.c
--- a/sys/kern/vfs_getcwd.c     Sun Jun 09 17:57:08 2013 +0000
+++ b/sys/kern/vfs_getcwd.c     Sun Jun 09 18:29:25 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $ */
+/* $NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.48 2012/11/05 17:24:11 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.49 2013/06/09 18:29:25 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -153,7 +153,8 @@
 
        fileno = va.va_fileid;
 
-       dirbuflen = DIRBLKSIZ;
+       /* I guess UFS_DIRBLKSIZ is a good guess at a good size to use? */
+       dirbuflen = UFS_DIRBLKSIZ;
        if (dirbuflen < va.va_blocksize)
                dirbuflen = va.va_blocksize;
        dirbuf = kmem_alloc(dirbuflen, KM_SLEEP);