diff options
author | Andreas Gampe <agampe@google.com> | 2014-09-30 21:48:18 -0700 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-07 14:33:51 -0800 |
commit | cfedceb8c180a2e176154d461659e0c3569dc931 (patch) | |
tree | 00de5f6ee61e72713c3b141f5a308f33f312bf53 /cmds/idmap | |
parent | 59701b9ba5c453e327bc0e6873a9f6ff87a10391 (diff) | |
download | frameworks_base-cfedceb8c180a2e176154d461659e0c3569dc931.zip frameworks_base-cfedceb8c180a2e176154d461659e0c3569dc931.tar.gz frameworks_base-cfedceb8c180a2e176154d461659e0c3569dc931.tar.bz2 |
Frameworks/base: Turn on -Wall -Werror in cmds
Fix small warnings, turn on -Wall -Werror.
Change-Id: Iab1f01a7c7ebd6ba832b75067c5e395f380a1b8b
Diffstat (limited to 'cmds/idmap')
-rw-r--r-- | cmds/idmap/Android.mk | 2 | ||||
-rw-r--r-- | cmds/idmap/create.cpp | 8 | ||||
-rw-r--r-- | cmds/idmap/inspect.cpp | 6 | ||||
-rw-r--r-- | cmds/idmap/scan.cpp | 28 |
4 files changed, 11 insertions, 33 deletions
diff --git a/cmds/idmap/Android.mk b/cmds/idmap/Android.mk index ffa83f2..50ccb07 100644 --- a/cmds/idmap/Android.mk +++ b/cmds/idmap/Android.mk @@ -25,4 +25,6 @@ LOCAL_C_INCLUDES := external/zlib LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code + include $(BUILD_EXECUTABLE) diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp index 593a197..28da3d6 100644 --- a/cmds/idmap/create.cpp +++ b/cmds/idmap/create.cpp @@ -22,7 +22,7 @@ namespace { if (entry == NULL) { return -1; } - if (!zip->getEntryInfo(entry, NULL, NULL, NULL, NULL, NULL, (long*)crc)) { + if (!zip->getEntryInfo(entry, NULL, NULL, NULL, NULL, NULL, reinterpret_cast<long*>(crc))) { return -1; } zip->releaseEntry(entry); @@ -66,7 +66,7 @@ fail: fprintf(stderr, "error: write: %s\n", strerror(errno)); return -1; } - bytesLeft -= w; + bytesLeft -= static_cast<size_t>(w); } return 0; } @@ -84,7 +84,7 @@ fail: } char buf[N]; - ssize_t bytesLeft = N; + size_t bytesLeft = N; if (lseek(idmap_fd, SEEK_SET, 0) < 0) { return true; } @@ -93,7 +93,7 @@ fail: if (r < 0) { return true; } - bytesLeft -= r; + bytesLeft -= static_cast<size_t>(r); if (bytesLeft == 0) { break; } diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp index b9ac8a5..f6afc85 100644 --- a/cmds/idmap/inspect.cpp +++ b/cmds/idmap/inspect.cpp @@ -152,13 +152,13 @@ namespace { printe("failed to get resource name id=0x%08x\n", res_id); return UNKNOWN_ERROR; } - if (package) { + if (package != NULL) { *package = String8(String16(data.package, data.packageLen)); } - if (type) { + if (type != NULL) { *type = String8(String16(data.type, data.typeLen)); } - if (name) { + if (name != NULL) { *name = String8(String16(data.name, data.nameLen)); } return NO_ERROR; diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp index 1153f38..4f19a74 100644 --- a/cmds/idmap/scan.cpp +++ b/cmds/idmap/scan.cpp @@ -64,30 +64,6 @@ namespace { return String8(tmp); } - int mkdir_p(const String8& path, uid_t uid, gid_t gid) - { - static const mode_t mode = - S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH; - struct stat st; - - if (stat(path.string(), &st) == 0) { - return 0; - } - if (mkdir_p(path.getPathDir(), uid, gid) < 0) { - return -1; - } - if (mkdir(path.string(), 0755) != 0) { - return -1; - } - if (chown(path.string(), uid, gid) == -1) { - return -1; - } - if (chmod(path.string(), mode) == -1) { - return -1; - } - return 0; - } - int parse_overlay_tag(const ResXMLTree& parser, const char *target_package_name) { const size_t N = parser.getAttributeCount(); @@ -98,7 +74,7 @@ namespace { String16 key(parser.getAttributeName(i, &len)); if (key == String16("targetPackage")) { const uint16_t *p = parser.getAttributeStringValue(i, &len); - if (p) { + if (p != NULL) { target = String16(p, len); } } else if (key == String16("priority")) { @@ -164,7 +140,7 @@ namespace { return -1; } FileMap *dataMap = zip->createEntryFileMap(entry); - if (!dataMap) { + if (dataMap == NULL) { ALOGW("%s: failed to create FileMap\n", __FUNCTION__); return -1; } |