diff options
| -rw-r--r-- | cmds/backup/backup.cpp | 2 | ||||
| -rw-r--r-- | cmds/idmap/create.cpp | 2 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmds/backup/backup.cpp b/cmds/backup/backup.cpp index 03ceffa..8d9b528 100644 --- a/cmds/backup/backup.cpp +++ b/cmds/backup/backup.cpp @@ -75,7 +75,7 @@ static int perform_list(const char* filename) size_t dataSize; err = reader.ReadEntityHeader(&key, &dataSize); if (err == 0) { - printf(" entity: %s (%d bytes)\n", key.string(), dataSize); + printf(" entity: %s (%zu bytes)\n", key.string(), dataSize); } else { printf(" Error reading entity header\n"); } diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp index 28da3d6..7a501a4 100644 --- a/cmds/idmap/create.cpp +++ b/cmds/idmap/create.cpp @@ -78,7 +78,7 @@ fail: if (fstat(idmap_fd, &st) == -1) { return true; } - if (st.st_size < N) { + if (st.st_size < static_cast<off_t>(N)) { // file is empty or corrupt return true; } diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 03b7f4a..ba72cd5 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1793,9 +1793,7 @@ public: const char* targetPath, const char* overlayPath, void** outData, size_t* outSize) const; - enum { - IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256, - }; + static const size_t IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256; // Retrieve idmap meta-data. // |