commit ebee1379eaf4306eb2de9437844009aa7eb18c28
author Andreas Gampe <agampe@google.com> Fri Nov 07 16:28:19 2014 -0800
committer Andreas Gampe <agampe@google.com> Sat Nov 08 01:04:45 2014 +0000
tree 165544f1e460464e14c41e8b88f73107e1668494
parent 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b

Frameworks/base: Fix two warnings in cmds

Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a

cmds/backup/backup.cpp

diff --git a/cmds/backup/backup.cpp b/cmds/backup/backup.cpp
index 03ceffae0..8d9b528 100644
--- a/cmds/backup/backup.cpp
+++ b/cmds/backup/backup.cpp
@@ -75,7 +75,7 @@
                 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");
                 }

cmds/idmap/create.cpp

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 @@
         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;
         }

include/androidfw/ResourceTypes.h

diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index f7730f2f..a44975b 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1773,9 +1773,7 @@
             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.
     //