From 564fe6c1ddc0a531a0f751a71708686c3aacc175 Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Sat, 6 Feb 2016 19:48:33 -0800 Subject: [PATCH] Revert "Temporary instrumentation in native image loading" --- src/pal/src/map/map.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pal/src/map/map.cpp b/src/pal/src/map/map.cpp index da19383..c94f5ea 100644 --- a/src/pal/src/map/map.cpp +++ b/src/pal/src/map/map.cpp @@ -2439,7 +2439,7 @@ void * MAPMapPEFile(HANDLE hFile) if (MAP_FAILED == loadedBase) { - /* ERROR_(LOADER) */ fprintf(stderr, "mmap failed with code %d: %s.\n", errno, strerror( errno ) ); + ERROR_(LOADER)( "mmap failed with code %d: %s.\n", errno, strerror( errno ) ); palError = FILEGetLastErrorFromErrno(); loadedBase = NULL; // clear it so we don't try to use it during clean-up goto doneReleaseMappingCriticalSection; @@ -2475,7 +2475,7 @@ void * MAPMapPEFile(HANDLE hFile) (void**)&loadedHeader); if (NO_ERROR != palError) { - /* ERROR_(LOADER) */ fprintf(stderr, "mmap of PE header failed\n" ); + ERROR_(LOADER)( "mmap of PE header failed\n" ); goto doneReleaseMappingCriticalSection; } @@ -2570,7 +2570,7 @@ void * MAPMapPEFile(HANDLE hFile) §ionData); if (NO_ERROR != palError) { - /* ERROR_(LOADER) */ fprintf(stderr, "mmap of section %d failed\n", i ); + ERROR_(LOADER)( "mmap of section %d failed\n", i ); goto doneReleaseMappingCriticalSection; } @@ -2633,7 +2633,7 @@ done: else { retval = NULL; - /* LOGEXIT */ fprintf(stderr, "MAPMapPEFile error: %d\n", palError); + LOGEXIT("MAPMapPEFile error: %d\n", palError); // If we had an error, and had mapped anything, we need to unmap it if (loadedBase != NULL) -- 2.7.4