Module Name: src
Committed By: riastradh
Date: Sun Aug 5 02:03:05 UTC 2012
Modified Files:
src/tests/fs/common: fstest_ffs.c
Log Message:
Fix ffs_fstest_delfs's error branch for rump_pub_etfs_remove.
rump_pub_etfs_remove returns an error code, rather than setting errno
and returning -1.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/common/fstest_ffs.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/fstest_ffs.c
diff -u src/tests/fs/common/fstest_ffs.c:1.5 src/tests/fs/common/fstest_ffs.c:1.6
--- src/tests/fs/common/fstest_ffs.c:1.5 Sun Jun 26 13:06:00 2011
+++ src/tests/fs/common/fstest_ffs.c Sun Aug 5 02:03:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_ffs.c,v 1.5 2011/06/26 13:06:00 christos Exp $ */
+/* $NetBSD: fstest_ffs.c,v 1.6 2012/08/05 02:03:05 riastradh Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -104,8 +104,10 @@ ffs_fstest_delfs(const atf_tc_t *tc, voi
struct ffstestargs *args = buf;
res = rump_pub_etfs_remove(args->ta_devpath);
- if (res != 0)
- return res;
+ if (res != 0) {
+ errno = res;
+ return -1;
+ }
res = unlink(args->ta_imgpath);
if (res != 0)
