Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97fe4d0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unused but set variables"

parents 6f3ebef5 82ac868c

tools/aapt/AaptAssets.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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;

tools/aapt/ResourceTable.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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());