Module Name: src
Committed By: dholland
Date: Sun Jun 9 18:29:41 UTC 2013
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
Stick UFS_ in front of these symbols:
DIRBLKSIZ
DIRECTSIZ
DIRSIZ
OLDDIRFMT
NEWDIRFMT
Part of PR 47909.
(two stragglers in this commit; oops)
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.114 src/sbin/newfs/mkfs.c:1.115
--- src/sbin/newfs/mkfs.c:1.114 Sun Mar 17 12:25:36 2013
+++ src/sbin/newfs/mkfs.c Sun Jun 9 18:29:41 2013
@@ -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 @@ makedir(struct direct *protodir, int ent
{
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 @@ setblock(struct fs *fs, unsigned char *c
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);
