summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2016-03-29 12:39:51 -0400
committerKeith Bostic <keith@wiredtiger.com>2016-03-29 12:39:51 -0400
commit6ee271cf24d1f2264fb6d962f15d156424a66075 (patch)
tree33f7e8fb70e2bf2b0d6e6a47e57aa754ce7c20f3
parent4fc247a4c3c81eb992dda02b88baffcfd74ef266 (diff)
downloadmongo-6ee271cf24d1f2264fb6d962f15d156424a66075.tar.gz
WT-2330: in-memory configurations should not create on-disk collection files
Remove the "posix" and "win" parts of the os_posix and os_win FS code file names, it's no longer needed. KNF fix for a long line.
-rw-r--r--build_win/filelist.win2
-rw-r--r--dist/filelist2
-rwxr-xr-xdist/s_win2
-rw-r--r--src/os_posix/os_fs.c (renamed from src/os_posix/os_fs_posix.c)0
-rw-r--r--src/os_win/os_fs.c (renamed from src/os_win/os_fs_win.c)2
5 files changed, 4 insertions, 4 deletions
diff --git a/build_win/filelist.win b/build_win/filelist.win
index b530fb7f1bc..c370303d5f8 100644
--- a/build_win/filelist.win
+++ b/build_win/filelist.win
@@ -114,7 +114,7 @@ src/os_common/os_strtouq.c
src/os_win/os_dir.c
src/os_win/os_dlopen.c
src/os_win/os_errno.c
-src/os_win/os_fs_win.c
+src/os_win/os_fs.c
src/os_win/os_getenv.c
src/os_win/os_map.c
src/os_win/os_mtx_cond.c
diff --git a/dist/filelist b/dist/filelist
index 4b2ca809df7..1d7ffa76922 100644
--- a/dist/filelist
+++ b/dist/filelist
@@ -115,7 +115,7 @@ src/os_posix/os_dir.c
src/os_posix/os_dlopen.c
src/os_posix/os_errno.c
src/os_posix/os_fallocate.c
-src/os_posix/os_fs_posix.c
+src/os_posix/os_fs.c
src/os_posix/os_getenv.c
src/os_posix/os_map.c
src/os_posix/os_mtx_cond.c
diff --git a/dist/s_win b/dist/s_win
index ff8e1638f69..562e89f94c6 100755
--- a/dist/s_win
+++ b/dist/s_win
@@ -53,7 +53,7 @@ win_filelist()
echo 'src/os_win/os_dir.c'
echo 'src/os_win/os_dlopen.c'
echo 'src/os_win/os_errno.c'
- echo 'src/os_win/os_fs_win.c'
+ echo 'src/os_win/os_fs.c'
echo 'src/os_win/os_getenv.c'
echo 'src/os_win/os_map.c'
echo 'src/os_win/os_mtx_cond.c'
diff --git a/src/os_posix/os_fs_posix.c b/src/os_posix/os_fs.c
index 2d0bee7ae05..2d0bee7ae05 100644
--- a/src/os_posix/os_fs_posix.c
+++ b/src/os_posix/os_fs.c
diff --git a/src/os_win/os_fs_win.c b/src/os_win/os_fs.c
index e7f67045572..f68c3cfdfe7 100644
--- a/src/os_win/os_fs_win.c
+++ b/src/os_win/os_fs.c
@@ -220,7 +220,7 @@ __win_handle_close(WT_SESSION_IMPL *session, WT_FH *fh)
if (fh->fp == NULL) {
/*
* We don't open Windows system handles when opening directories
- * for flushing, since it is not necessary (or possible) to flush
+ * for flushing, as it is not necessary (or possible) to flush
* a directory on Windows. Confirm the file handle is set before
* attempting to close it.
*/