diff options
| -rw-r--r-- | file_io/win32/dir.c | 16 | ||||
| -rw-r--r-- | include/arch/win32/apr_arch_file_io.h | 13 |
2 files changed, 9 insertions, 20 deletions
diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c index 6ddcfe64b..e97447cd6 100644 --- a/file_io/win32/dir.c +++ b/file_io/win32/dir.c @@ -65,7 +65,7 @@ APR_DECLARE(apr_status_t) apr_dir_open(apr_dir_t **new, const char *dirname, /* Create a buffer for the longest file name we will ever see */ - (*new)->w.entry = apr_pcalloc(pool, sizeof(WIN32_FIND_DATAW)); + (*new)->entry = apr_pcalloc(pool, sizeof(WIN32_FIND_DATAW)); (*new)->name = apr_pcalloc(pool, APR_FILE_MAX * 3 + 1); (*new)->rootlen = len - 1; (*new)->pool = pool; @@ -126,7 +126,7 @@ APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted, } thedir->dirhand = FindFirstFileExW(wdirname, info_level, - thedir->w.entry, + thedir->entry, FindExSearchNameMatch, NULL, 0); eos[0] = '\0'; @@ -143,23 +143,23 @@ APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted, */ thedir->bof = 0; } - else if (!FindNextFileW(thedir->dirhand, thedir->w.entry)) { + else if (!FindNextFileW(thedir->dirhand, thedir->entry)) { return apr_get_os_error(); } while (thedir->rootlen && - thedir->rootlen + wcslen(thedir->w.entry->cFileName) >= APR_PATH_MAX) + thedir->rootlen + wcslen(thedir->entry->cFileName) >= APR_PATH_MAX) { - if (!FindNextFileW(thedir->dirhand, thedir->w.entry)) { + if (!FindNextFileW(thedir->dirhand, thedir->entry)) { return apr_get_os_error(); } } if ((rv = unicode_to_utf8_path(thedir->name, APR_FILE_MAX * 3 + 1, - thedir->w.entry->cFileName))) + thedir->entry->cFileName))) return rv; fname = thedir->name; - fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) thedir->w.entry, + fillin_fileinfo(finfo, (WIN32_FILE_ATTRIBUTE_DATA *) thedir->entry, 0, 1, fname, wanted); finfo->pool = thedir->pool; @@ -184,7 +184,7 @@ APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted, eos = wcschr(wdirname, '\0'); } - wcscpy(eos, thedir->w.entry->cFileName); + wcscpy(eos, thedir->entry->cFileName); rv = more_finfo(finfo, wdirname, wanted, MORE_OF_WFSPEC); eos[0] = '\0'; return rv; diff --git a/include/arch/win32/apr_arch_file_io.h b/include/arch/win32/apr_arch_file_io.h index 5302a15be..cb02020f7 100644 --- a/include/arch/win32/apr_arch_file_io.h +++ b/include/arch/win32/apr_arch_file_io.h @@ -199,18 +199,7 @@ struct apr_dir_t { apr_size_t rootlen; char *dirname; char *name; - union { -#if APR_HAS_UNICODE_FS - struct { - WIN32_FIND_DATAW *entry; - } w; -#endif -#if APR_HAS_ANSI_FS - struct { - WIN32_FIND_DATAA *entry; - } n; -#endif - }; + WIN32_FIND_DATAW *entry; int bof; }; |