diff options
author | 2021-08-20 02:48:22 +0800 | |
---|---|---|
committer | 2021-08-19 18:57:56 +0000 | |
commit | 82ac868c8c6c17d2c3eeee564962994cc65d433b (patch) | |
tree | c3dbd6d525d789f64a2342dab21f2f76c47a793b | |
parent | a6f81885390bf02ac5507ca96df0fe733429e549 (diff) |
Remove unused but set variables
Discovered by unused-but-set-variable diagnostics.
Test: build
Bug: 197240255
Change-Id: I32a1185f9714848c91860fbaa76521d490c842b9
-rw-r--r-- | tools/aapt/AaptAssets.cpp | 2 | ||||
-rw-r--r-- | tools/aapt/ResourceTable.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 672731cc2939..899d26818548 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -319,12 +319,10 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta // The second subtag can either be a script or a region code. // If its size is 4, it's a script code, else it's a region code. - bool hasRegion = false; if (subtags[1].size() == 4) { setScript(subtags[1]); } else if (subtags[1].size() == 2 || subtags[1].size() == 3) { setRegion(subtags[1]); - hasRegion = true; } else { fprintf(stderr, "ERROR: Invalid BCP 47 tag in directory name %s\n", part.string()); return -1; diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 257e96b6e51a..b9de11b0026b 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -2475,11 +2475,10 @@ void ResourceTable::reportError(void* accessorCookie, const char* fmt, ...) { if (accessorCookie != NULL && fmt != NULL) { AccessorCookie* ac = (AccessorCookie*)accessorCookie; - int retval=0; char buf[1024]; va_list ap; va_start(ap, fmt); - retval = vsnprintf(buf, sizeof(buf), fmt, ap); + vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); ac->sourcePos.error("Error: %s (at '%s' with value '%s').\n", buf, ac->attr.string(), ac->value.string()); |