diff options
Diffstat (limited to 'src/third_party/wiredtiger/src/os_win/os_fs.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/os_win/os_fs.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/os_win/os_fs.c b/src/third_party/wiredtiger/src/os_win/os_fs.c index 276aae62796..9463252a6bb 100644 --- a/src/third_party/wiredtiger/src/os_win/os_fs.c +++ b/src/third_party/wiredtiger/src/os_win/os_fs.c @@ -268,8 +268,8 @@ __win_file_read( nr = 0; /* Assert direct I/O is aligned and a multiple of the alignment. */ - WT_ASSERT( - session, !win_fh->direct_io || S2C(session)->buffer_alignment == 0 || + WT_ASSERT(session, + !win_fh->direct_io || S2C(session)->buffer_alignment == 0 || (!((uintptr_t)buf & (uintptr_t)(S2C(session)->buffer_alignment - 1)) && len >= S2C(session)->buffer_alignment && len % S2C(session)->buffer_alignment == 0)); @@ -283,8 +283,7 @@ __win_file_read( windows_error = __wt_getlasterror(); ret = __wt_map_windows_error(windows_error); __wt_err(session, ret, - "%s: handle-read: ReadFile: failed to read %lu " - "bytes at offset %" PRIuMAX ": %s", + "%s: handle-read: ReadFile: failed to read %lu bytes at offset %" PRIuMAX ": %s", file_handle->name, chunk, (uintmax_t)offset, __wt_formatmessage(session, windows_error)); return (ret); @@ -416,8 +415,8 @@ __win_file_write( nw = 0; /* Assert direct I/O is aligned and a multiple of the alignment. */ - WT_ASSERT( - session, !win_fh->direct_io || S2C(session)->buffer_alignment == 0 || + WT_ASSERT(session, + !win_fh->direct_io || S2C(session)->buffer_alignment == 0 || (!((uintptr_t)buf & (uintptr_t)(S2C(session)->buffer_alignment - 1)) && len >= S2C(session)->buffer_alignment && len % S2C(session)->buffer_alignment == 0)); @@ -431,8 +430,7 @@ __win_file_write( windows_error = __wt_getlasterror(); ret = __wt_map_windows_error(windows_error); __wt_err(session, ret, - "%s: handle-write: WriteFile: failed to write %lu " - "bytes at offset %" PRIuMAX ": %s", + "%s: handle-write: WriteFile: failed to write %lu bytes at offset %" PRIuMAX ": %s", file_handle->name, chunk, (uintmax_t)offset, __wt_formatmessage(session, windows_error)); return (ret); @@ -530,10 +528,10 @@ __win_open_file(WT_FILE_SYSTEM *file_system, WT_SESSION *wt_session, const char windows_error = __wt_getlasterror(); ret = __wt_map_windows_error(windows_error); __wt_err(session, ret, - win_fh->direct_io ? "%s: handle-open: CreateFileW: failed with direct " - "I/O configured, some filesystem types do not " - "support direct I/O: %s" : - "%s: handle-open: CreateFileW: %s", + win_fh->direct_io ? + "%s: handle-open: CreateFileW: failed with direct I/O configured, some filesystem " + "types do not support direct I/O: %s" : + "%s: handle-open: CreateFileW: %s", name, __wt_formatmessage(session, windows_error)); WT_ERR(ret); } |