Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Frameworks/base: Fix two warnings in cmds"

Browse Source
This commit is contained in:
Andreas Gampe
2014-11-08 01:10:49 +00:00
committed by Gerrit Code Review
parent 487ae9b8dc ebee1379ea
commit f89a2fdacb
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/backup/backup.cpp
View File

@@ -75,7 +75,7 @@ static int perform_list(const char* filename)
size_t dataSize; size_t dataSize;
err = reader.ReadEntityHeader(&key, &dataSize); err = reader.ReadEntityHeader(&key, &dataSize);
if (err == 0) { if (err == 0) {
printf(" entity: %s (%d bytes)\n", key.string(), dataSize); printf(" entity: %s (%zu bytes)\n", key.string(), dataSize);
} else { } else {
printf(" Error reading entity header\n"); printf(" Error reading entity header\n");
} }

2
cmds/idmap/create.cpp
View File

@@ -78,7 +78,7 @@ fail:
if (fstat(idmap_fd, &st) == -1) { if (fstat(idmap_fd, &st) == -1) {
return true; return true;
} }
if (st.st_size < N) { if (st.st_size < static_cast<off_t>(N)) {
// file is empty or corrupt // file is empty or corrupt
return true; return true;
} }

4
include/androidfw/ResourceTypes.h
View File

@@ -1773,9 +1773,7 @@ public:
const char* targetPath, const char* overlayPath, const char* targetPath, const char* overlayPath,
void** outData, size_t* outSize) const; void** outData, size_t* outSize) const;
enum { static const size_t IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256;
IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256,
};
// Retrieve idmap meta-data. // Retrieve idmap meta-data.
// //