diff options
author | Colin Cross <ccross@android.com> | 2016-09-15 18:15:37 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-09-22 13:03:15 -0700 |
commit | 17b5b82d64686d482e6dcf96ee54fd62234d5f27 (patch) | |
tree | 59c9126e3cbcecbc0b06178f55bc3b39cadef1ce /libutils/FileMap.cpp | |
parent | 588b3b0c03690573bb8147d9645f0400e5db9a22 (diff) | |
download | system_core-17b5b82d64686d482e6dcf96ee54fd62234d5f27.tar.gz system_core-17b5b82d64686d482e6dcf96ee54fd62234d5f27.tar.bz2 system_core-17b5b82d64686d482e6dcf96ee54fd62234d5f27.zip |
Fix warnings in libutils headers
system/core/include is included in the global include path using
-isystem, which hides all warnings. Fix warnings in libutils
headers in preparation for moving from -isystem to -I.
- Fix implicit cast from int64_t to long in Condition.h. Remove
the __LP64__ check and always compare against LONG_MAX before
casting.
- Fix implicit cast from size_t to ssize_t in KeyedVector.h
- Fix -Wshadow-field-in-constructor warnings in Looper.h and RefBase.h
- Move destructors for MessageHandler and LooperCallback to Looper.cpp
and ReferenceRenamer and VirtualLightRefBase to RefBase.cpp to prevent
vtables in every compilation unit.
- Declare template variables in Singleton.h
- Fix old-style casts in StrongPointer.h and TypeHelpers.h
- Use template metaprogramming in TypeHelpers.h to avoid warnings on
memmove on non-trivial types.
- Add an assignment operator to key_value_pair_t to complete
rule-of-three
- Use memcpy instead of dereferencing a reinterpret_casted pointer to
treat the bits of a float or double as int32_t or int64_t
- Escape unicode sequences inside doxygen comments between \code and
\endcode
- Remove WIN32 ZD definition in Compat.h, %zd works fine with mingw
- Fix WIN32 printf warnings in Filemap.cpp
- Initialize mNullValue with 0 in LruCache.h, some of the tests use a
non-pointer type for TValue.
Test: m -j native
Bug: 31492149
Change-Id: I385a05a3ca01258e44fe3b37ef77e4aaff547b26
Diffstat (limited to 'libutils/FileMap.cpp')
-rw-r--r-- | libutils/FileMap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp index 4f4b8895a..1afa1ecae 100644 --- a/libutils/FileMap.cpp +++ b/libutils/FileMap.cpp @@ -98,7 +98,7 @@ FileMap::~FileMap(void) } #if defined(__MINGW32__) if (mBasePtr && UnmapViewOfFile(mBasePtr) == 0) { - ALOGD("UnmapViewOfFile(%p) failed, error = %" PRId32 "\n", mBasePtr, + ALOGD("UnmapViewOfFile(%p) failed, error = %lu\n", mBasePtr, GetLastError() ); } if (mFileMapping != INVALID_HANDLE_VALUE) { @@ -138,7 +138,7 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le mFileHandle = (HANDLE) _get_osfhandle(fd); mFileMapping = CreateFileMapping( mFileHandle, NULL, protect, 0, 0, NULL); if (mFileMapping == NULL) { - ALOGE("CreateFileMapping(%p, %" PRIx32 ") failed with error %" PRId32 "\n", + ALOGE("CreateFileMapping(%p, %lx) failed with error %lu\n", mFileHandle, protect, GetLastError() ); return false; } @@ -153,7 +153,7 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le (DWORD)(adjOffset), adjLength ); if (mBasePtr == NULL) { - ALOGE("MapViewOfFile(%" PRId64 ", %zu) failed with error %" PRId32 "\n", + ALOGE("MapViewOfFile(%" PRId64 ", %zu) failed with error %lu\n", adjOffset, adjLength, GetLastError() ); CloseHandle(mFileMapping); mFileMapping = INVALID_HANDLE_VALUE; |