Page MenuHomeFreeBSD
Files F143995981

D55054.id170987.diff
No OneTemporary
Actions

D55054.id170987.diff
View Options

diff --git a/lib/libc/tests/gen/dir2_test.c b/lib/libc/tests/gen/dir2_test.c
--- a/lib/libc/tests/gen/dir2_test.c
+++ b/lib/libc/tests/gen/dir2_test.c
@@ -41,7 +41,6 @@
ATF_TC(telldir_after_seekdir);
ATF_TC_HEAD(telldir_after_seekdir, tc)
{
-
atf_tc_set_md_var(tc, "descr", "Calling telldir(3) after seekdir(3) "
"should return the argument passed to seekdir.");
}
@@ -50,7 +49,7 @@
const int NUMFILES = 1000;
char template[] = "dXXXXXX";
char *tmpdir;
- int i, dirfd;
+ int i, dd;
DIR *dirp;
struct dirent *de;
long beginning, middle, end, td;
@@ -58,8 +57,8 @@
/* Create a temporary directory */
tmpdir = mkdtemp(template);
ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed");
- dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY);
- ATF_REQUIRE(dirfd > 0);
+ dd = open(tmpdir, O_RDONLY | O_DIRECTORY);
+ ATF_REQUIRE(dd > 0);
/*
* Fill it with files. Must be > 128 to ensure that the directory
@@ -70,14 +69,14 @@
char filename[16];
snprintf(filename, sizeof(filename), "%d", i);
- fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600);
+ fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600);
ATF_REQUIRE(fd > 0);
close(fd);
}
/* Get some directory bookmarks in various locations */
- dirp = fdopendir(dirfd);
- ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed");
+ dirp = fdopendir(dd);
+ ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed");
beginning = telldir(dirp);
for (i = 0; i < NUMFILES / 2; i = i+1) {
de = readdir(dirp);
@@ -126,7 +125,7 @@
const int NUMFILES = 129;
char template[] = "dXXXXXX";
char *tmpdir;
- int i, dirfd;
+ int i, dd;
DIR *dirp;
struct dirent *de;
long td;
@@ -135,8 +134,8 @@
/* Create a temporary directory */
tmpdir = mkdtemp(template);
ATF_REQUIRE_MSG(tmpdir != NULL, "mkdtemp failed");
- dirfd = open(tmpdir, O_RDONLY | O_DIRECTORY);
- ATF_REQUIRE(dirfd > 0);
+ dd = open(tmpdir, O_RDONLY | O_DIRECTORY);
+ ATF_REQUIRE(dd > 0);
/*
* Fill it with files. Must be > 128 to ensure that the directory
@@ -147,14 +146,14 @@
char filename[16];
snprintf(filename, sizeof(filename), "%d", i);
- fd = openat(dirfd, filename, O_WRONLY | O_CREAT, 0600);
+ fd = openat(dd, filename, O_WRONLY | O_CREAT, 0600);
ATF_REQUIRE(fd > 0);
close(fd);
}
/* Read all entries within the first page */
- dirp = fdopendir(dirfd);
- ATF_REQUIRE_MSG(dirfd >= 0, "fdopendir failed");
+ dirp = fdopendir(dd);
+ ATF_REQUIRE_MSG(dd >= 0, "fdopendir failed");
for (i = 0; i < NUMFILES - 1; i = i + 1)
ATF_REQUIRE_MSG(readdir(dirp) != NULL, "readdir failed");
@@ -178,9 +177,8 @@
ATF_TP_ADD_TCS(tp)
{
-
ATF_TP_ADD_TC(tp, telldir_after_seekdir);
ATF_TP_ADD_TC(tp, telldir_at_end_of_block);
- return atf_no_error();
+ return (atf_no_error());
}

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 4, 3:15 AM (1 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28425321
Default Alt Text
D55054.id170987.diff (2 KB)

Event Timeline