diff options
Diffstat (limited to 'xmlwf/win32filemap.c')
| -rw-r--r-- | xmlwf/win32filemap.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/xmlwf/win32filemap.c b/xmlwf/win32filemap.c index a040a097db4c8..0c9b7ecc5ffbf 100644 --- a/xmlwf/win32filemap.c +++ b/xmlwf/win32filemap.c @@ -34,14 +34,14 @@ #define WIN32_LEAN_AND_MEAN 1 #ifdef XML_UNICODE_WCHAR_T -# ifndef XML_UNICODE -# define XML_UNICODE -# endif +# ifndef XML_UNICODE +# define XML_UNICODE +# endif #endif #ifdef XML_UNICODE -# define UNICODE -# define _UNICODE +# define UNICODE +# define _UNICODE #endif /* XML_UNICODE */ #include <windows.h> #include <stdio.h> @@ -53,8 +53,7 @@ static void win32perror(const TCHAR *); int filemap(const TCHAR *name, void (*processor)(const void *, size_t, const TCHAR *, void *arg), - void *arg) -{ + void *arg) { HANDLE f; HANDLE m; DWORD size; @@ -62,7 +61,7 @@ filemap(const TCHAR *name, void *p; f = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_FLAG_SEQUENTIAL_SCAN, NULL); + FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (f == INVALID_HANDLE_VALUE) { win32perror(name); return 0; @@ -75,7 +74,7 @@ filemap(const TCHAR *name, } if (sizeHi || (size > XML_MAX_CHUNK_LEN)) { CloseHandle(f); - return 2; /* Cannot be passed to XML_Parse in one go */ + return 2; /* Cannot be passed to XML_Parse in one go */ } /* CreateFileMapping barfs on zero length files */ if (size == 0) { @@ -97,7 +96,7 @@ filemap(const TCHAR *name, CloseHandle(f); return 0; } - processor(p, size, name, arg); + processor(p, size, name, arg); UnmapViewOfFile(p); CloseHandle(m); CloseHandle(f); @@ -105,21 +104,15 @@ filemap(const TCHAR *name, } static void -win32perror(const TCHAR *s) -{ +win32perror(const TCHAR *s) { LPVOID buf; - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER - | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - GetLastError(), - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &buf, - 0, + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&buf, 0, NULL)) { _ftprintf(stderr, _T("%s: %s"), s, buf); fflush(stderr); LocalFree(buf); - } - else + } else _ftprintf(stderr, _T("%s: unknown Windows error\n"), s); } |