Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update filesystem helper functions namespace (from XXX_mount to 

XXX_fstest_mount) to avoid conflicts with existing functions such as
puffs_mount.
This commit is contained in:
njoly 2010-07-12 21:37:47 +00:00
parent e4723ab868
commit 95f6e757bd
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/fs/common/ext2fs.c
View File

@ -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 @@ struct ext2fstestargs {
};
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 @@ ext2fs_newfs(void **buf, const char *image, off_t size)
}
static int
ext2fs_delfs(void *buf)
ext2fs_fstest_delfs(void *buf)
{
int res;
struct ext2fstestargs *args = buf;
@ -107,7 +107,7 @@ ext2fs_delfs(void *buf)
}
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 @@ ext2fs_mount(void *buf, const char *path, int flags)
}
static int
ext2fs_unmount(const char *path, int flags)
ext2fs_fstest_unmount(const char *path, int flags)
{
int res;

10
tests/fs/common/ffs.c
View File

@ -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 @@ struct ffstestargs {
};
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 @@ ffs_newfs(void **buf, const char *image, off_t size)
}
static int
ffs_delfs(void *buf)
ffs_fstest_delfs(void *buf)
{
int res;
struct ffstestargs *args = buf;
@ -106,7 +106,7 @@ ffs_delfs(void *buf)
}
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 @@ ffs_mount(void *buf, const char *path, int flags)
}
static int
ffs_unmount(const char *path, int flags)
ffs_fstest_unmount(const char *path, int flags)
{
int res;

10
tests/fs/common/h_fsmacros.h
View File

@ -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"); \
}

10
tests/fs/common/lfs.c
View File

@ -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 @@ struct lfstestargs {
};
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 @@ lfs_newfs(void **buf, const char *image, off_t size)
}
static int
lfs_delfs(void *buf)
lfs_fstest_delfs(void *buf)
{
int res;
struct lfstestargs *args = buf;
@ -108,7 +108,7 @@ lfs_delfs(void *buf)
}
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 @@ lfs_mount(void *buf, const char *path, int flags)
}
static int
lfs_unmount(const char *path, int flags)
lfs_fstest_unmount(const char *path, int flags)
{
int res;

10
tests/fs/common/msdosfs.c
View File

@ -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 @@ struct msdosfstestargs {
};
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 @@ msdosfs_newfs(void **buf, const char *image, off_t size)
}
static int
msdosfs_delfs(void *buf)
msdosfs_fstest_delfs(void *buf)
{
int res;
struct msdosfstestargs *args = buf;
@ -107,7 +107,7 @@ msdosfs_delfs(void *buf)
}
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 @@ msdosfs_mount(void *buf, const char *path, int flags)
}
static int
msdosfs_unmount(const char *path, int flags)
msdosfs_fstest_unmount(const char *path, int flags)
{
int res;

10
tests/fs/common/sysvbfs.c
View File

@ -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 @@ struct sysvbfstestargs {
};
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 @@ sysvbfs_newfs(void **buf, const char *image, off_t size)
}
static int
sysvbfs_delfs(void *buf)
sysvbfs_fstest_delfs(void *buf)
{
int res;
struct sysvbfstestargs *args = buf;
@ -107,7 +107,7 @@ sysvbfs_delfs(void *buf)
}
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 @@ sysvbfs_mount(void *buf, const char *path, int flags)
}
static int
sysvbfs_unmount(const char *path, int flags)
sysvbfs_fstest_unmount(const char *path, int flags)
{
int res;

10
tests/fs/common/tmpfs.c
View File

@ -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 @@ struct tmpfstestargs {
};
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 @@ tmpfs_newfs(void **buf, const char *image, off_t size)
}
static int
tmpfs_delfs(void *buf)
tmpfs_fstest_delfs(void *buf)
{
struct tmpfstestargs *args = buf;
@ -80,7 +80,7 @@ tmpfs_delfs(void *buf)
}
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 @@ tmpfs_mount(void *buf, const char *path, int flags)
}
static int
tmpfs_unmount(const char *path, int flags)
tmpfs_fstest_unmount(const char *path, int flags)
{
int res;