Module Name: src
Committed By: njoly
Date: Mon Jul 12 21:37:47 UTC 2010
Modified Files:
src/tests/fs/common: ext2fs.c ffs.c h_fsmacros.h lfs.c msdosfs.c
sysvbfs.c tmpfs.c
Log Message:
Update filesystem helper functions namespace (from XXX_mount to
XXX_fstest_mount) to avoid conflicts with existing functions such as
puffs_mount.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/common/ext2fs.c \
src/tests/fs/common/ffs.c src/tests/fs/common/msdosfs.c \
src/tests/fs/common/sysvbfs.c src/tests/fs/common/tmpfs.c
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/common/h_fsmacros.h
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/common/lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/ext2fs.c
diff -u src/tests/fs/common/ext2fs.c:1.2 src/tests/fs/common/ext2fs.c:1.3
--- src/tests/fs/common/ext2fs.c:1.2 Mon Jul 5 14:53:03 2010
+++ src/tests/fs/common/ext2fs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */
+/* $NetBSD: ext2fs.c,v 1.3 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
};
static int
-ext2fs_newfs(void **buf, const char *image, off_t size)
+ext2fs_fstest_newfs(void **buf, const char *image, off_t size)
{
char cmd[1024];
int res;
@@ -88,7 +88,7 @@
}
static int
-ext2fs_delfs(void *buf)
+ext2fs_fstest_delfs(void *buf)
{
int res;
struct ext2fstestargs *args = buf;
@@ -107,7 +107,7 @@
}
static int
-ext2fs_mount(void *buf, const char *path, int flags)
+ext2fs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct ext2fstestargs *args = buf;
@@ -122,7 +122,7 @@
}
static int
-ext2fs_unmount(const char *path, int flags)
+ext2fs_fstest_unmount(const char *path, int flags)
{
int res;
Index: src/tests/fs/common/ffs.c
diff -u src/tests/fs/common/ffs.c:1.2 src/tests/fs/common/ffs.c:1.3
--- src/tests/fs/common/ffs.c:1.2 Mon Jul 5 14:53:03 2010
+++ src/tests/fs/common/ffs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */
+/* $NetBSD: ffs.c,v 1.3 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
};
static int
-ffs_newfs(void **buf, const char *image, off_t size)
+ffs_fstest_newfs(void **buf, const char *image, off_t size)
{
char cmd[1024];
int res;
@@ -87,7 +87,7 @@
}
static int
-ffs_delfs(void *buf)
+ffs_fstest_delfs(void *buf)
{
int res;
struct ffstestargs *args = buf;
@@ -106,7 +106,7 @@
}
static int
-ffs_mount(void *buf, const char *path, int flags)
+ffs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct ffstestargs *args = buf;
@@ -121,7 +121,7 @@
}
static int
-ffs_unmount(const char *path, int flags)
+ffs_fstest_unmount(const char *path, int flags)
{
int res;
Index: src/tests/fs/common/msdosfs.c
diff -u src/tests/fs/common/msdosfs.c:1.2 src/tests/fs/common/msdosfs.c:1.3
--- src/tests/fs/common/msdosfs.c:1.2 Mon Jul 5 14:53:03 2010
+++ src/tests/fs/common/msdosfs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */
+/* $NetBSD: msdosfs.c,v 1.3 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
};
static int
-msdosfs_newfs(void **buf, const char *image, off_t size)
+msdosfs_fstest_newfs(void **buf, const char *image, off_t size)
{
char cmd[1024];
int res;
@@ -88,7 +88,7 @@
}
static int
-msdosfs_delfs(void *buf)
+msdosfs_fstest_delfs(void *buf)
{
int res;
struct msdosfstestargs *args = buf;
@@ -107,7 +107,7 @@
}
static int
-msdosfs_mount(void *buf, const char *path, int flags)
+msdosfs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct msdosfstestargs *args = buf;
@@ -122,7 +122,7 @@
}
static int
-msdosfs_unmount(const char *path, int flags)
+msdosfs_fstest_unmount(const char *path, int flags)
{
int res;
Index: src/tests/fs/common/sysvbfs.c
diff -u src/tests/fs/common/sysvbfs.c:1.2 src/tests/fs/common/sysvbfs.c:1.3
--- src/tests/fs/common/sysvbfs.c:1.2 Mon Jul 5 14:53:03 2010
+++ src/tests/fs/common/sysvbfs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */
+/* $NetBSD: sysvbfs.c,v 1.3 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
};
static int
-sysvbfs_newfs(void **buf, const char *image, off_t size)
+sysvbfs_fstest_newfs(void **buf, const char *image, off_t size)
{
char cmd[1024];
int res;
@@ -88,7 +88,7 @@
}
static int
-sysvbfs_delfs(void *buf)
+sysvbfs_fstest_delfs(void *buf)
{
int res;
struct sysvbfstestargs *args = buf;
@@ -107,7 +107,7 @@
}
static int
-sysvbfs_mount(void *buf, const char *path, int flags)
+sysvbfs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct sysvbfstestargs *args = buf;
@@ -122,7 +122,7 @@
}
static int
-sysvbfs_unmount(const char *path, int flags)
+sysvbfs_fstest_unmount(const char *path, int flags)
{
int res;
Index: src/tests/fs/common/tmpfs.c
diff -u src/tests/fs/common/tmpfs.c:1.2 src/tests/fs/common/tmpfs.c:1.3
--- src/tests/fs/common/tmpfs.c:1.2 Mon Jul 5 14:53:03 2010
+++ src/tests/fs/common/tmpfs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */
+/* $NetBSD: tmpfs.c,v 1.3 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
};
static int
-tmpfs_newfs(void **buf, const char *image, off_t size)
+tmpfs_fstest_newfs(void **buf, const char *image, off_t size)
{
int res;
struct tmpfstestargs *args;
@@ -70,7 +70,7 @@
}
static int
-tmpfs_delfs(void *buf)
+tmpfs_fstest_delfs(void *buf)
{
struct tmpfstestargs *args = buf;
@@ -80,7 +80,7 @@
}
static int
-tmpfs_mount(void *buf, const char *path, int flags)
+tmpfs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct tmpfstestargs *args = buf;
@@ -95,7 +95,7 @@
}
static int
-tmpfs_unmount(const char *path, int flags)
+tmpfs_fstest_unmount(const char *path, int flags)
{
int res;
Index: src/tests/fs/common/h_fsmacros.h
diff -u src/tests/fs/common/h_fsmacros.h:1.6 src/tests/fs/common/h_fsmacros.h:1.7
--- src/tests/fs/common/h_fsmacros.h:1.6 Mon Jul 12 21:05:19 2010
+++ src/tests/fs/common/h_fsmacros.h Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: h_fsmacros.h,v 1.6 2010/07/12 21:05:19 njoly Exp $ */
+/* $NetBSD: h_fsmacros.h,v 1.7 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -60,14 +60,14 @@
{ \
void *tmp; \
atf_check_fstype(tc, type); \
- if (fs##_newfs(&tmp, IMGNAME, IMGSIZE) != 0) \
+ if (fs##_fstest_newfs(&tmp, IMGNAME, IMGSIZE) != 0) \
atf_tc_fail("newfs failed"); \
- if (fs##_mount(tmp, MNTNAME, 0) != 0) \
+ if (fs##_fstest_mount(tmp, MNTNAME, 0) != 0) \
atf_tc_fail("mount failed"); \
func(tc,MNTNAME); \
- if (fs##_unmount(MNTNAME, 0) != 0) \
+ if (fs##_fstest_unmount(MNTNAME, 0) != 0) \
atf_tc_fail("unmount failed"); \
- if (fs##_delfs(tmp) != 0) \
+ if (fs##_fstest_delfs(tmp) != 0) \
atf_tc_fail("delfs failed"); \
}
Index: src/tests/fs/common/lfs.c
diff -u src/tests/fs/common/lfs.c:1.4 src/tests/fs/common/lfs.c:1.5
--- src/tests/fs/common/lfs.c:1.4 Sun Jul 11 11:25:22 2010
+++ src/tests/fs/common/lfs.c Mon Jul 12 21:37:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.4 2010/07/11 11:25:22 pooka Exp $ */
+/* $NetBSD: lfs.c,v 1.5 2010/07/12 21:37:47 njoly Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
};
static int
-lfs_newfs(void **buf, const char *image, off_t size)
+lfs_fstest_newfs(void **buf, const char *image, off_t size)
{
char cmd[1024];
int res;
@@ -89,7 +89,7 @@
}
static int
-lfs_delfs(void *buf)
+lfs_fstest_delfs(void *buf)
{
int res;
struct lfstestargs *args = buf;
@@ -108,7 +108,7 @@
}
static int
-lfs_mount(void *buf, const char *path, int flags)
+lfs_fstest_mount(void *buf, const char *path, int flags)
{
int res;
struct lfstestargs *args = buf;
@@ -125,7 +125,7 @@
}
static int
-lfs_unmount(const char *path, int flags)
+lfs_fstest_unmount(const char *path, int flags)
{
int res;
