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

Commit 8b83f5c4 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by android-build-merger
Browse files

Merge "For Win32, don't cast ssize_t while printing" am: aaf8d7aa am: 466ada94 

am: ea5cf9f3

Change-Id: I77ee34cf56d68614b2f6e315c7f4797494f89c55
parents 6c38a996 ea5cf9f3

tools/aapt/ResourceTable.cpp

+4 −7
Original line number Diff line number Diff line
@@ -18,13 +18,10 @@ 
#include <utils/TypeHelpers.h>

#include <stdarg.h>



// SSIZE: mingw does not have signed size_t == ssize_t.

// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.

#if !defined(_WIN32)

#  define SSIZE(x) x

#  define STATUST(x) x

#else

#  define SSIZE(x) (signed size_t)x

#  define STATUST(x) (status_t)x

#endif
@@ -3040,7 +3037,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 
        sp<AaptFile> strFile = p->getTypeStringsData();

        ssize_t amt = data->writeData(strFile->getData(), strFile->getSize());

        if (kPrintStringMetrics) {

            fprintf(stderr, "**** type strings: %zd\n", SSIZE(amt));

            fprintf(stderr, "**** type strings: %zd\n", amt);

        }

        strAmt += amt;

        if (amt < 0) {
@@ -3050,7 +3047,7 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 
        strFile = p->getKeyStringsData();

        amt = data->writeData(strFile->getData(), strFile->getSize());

        if (kPrintStringMetrics) {

            fprintf(stderr, "**** key strings: %zd\n", SSIZE(amt));

            fprintf(stderr, "**** key strings: %zd\n", amt);

        }

        strAmt += amt;

        if (amt < 0) {
@@ -3322,8 +3319,8 @@ status_t ResourceTable::flatten(Bundle* bundle, const sp<const ResourceFilter>& 
    ssize_t amt = (dest->getSize()-strStart);

    strAmt += amt;

    if (kPrintStringMetrics) {

        fprintf(stderr, "**** value strings: %zd\n", SSIZE(amt));

        fprintf(stderr, "**** total strings: %zd\n", SSIZE(strAmt));

        fprintf(stderr, "**** value strings: %zd\n", amt);

        fprintf(stderr, "**** total strings: %zd\n", amt);

    }



    for (pi=0; pi<flatPackages.size(); pi++) {

tools/aapt/StringPool.cpp

+2 −9
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ 


#include "ResourceTable.h"



// SSIZE: mingw does not have signed size_t == ssize_t.

#if !defined(_WIN32)

#  define SSIZE(x) x

#else

#  define SSIZE(x) (signed size_t)x

#endif



// Set to true for noisy debug output.

static const bool kIsDebug = false;
@@ -202,7 +195,7 @@ ssize_t StringPool::add(const String16& value, 


    if (kIsDebug) {

        printf("Adding string %s to pool: pos=%zd eidx=%zd vidx=%zd\n",

                String8(value).string(), SSIZE(pos), SSIZE(eidx), SSIZE(vidx));

                String8(value).string(), pos, eidx, vidx);

    }



    return pos;
@@ -598,7 +591,7 @@ ssize_t StringPool::offsetForString(const String16& val) const 
    const Vector<size_t>* indices = offsetsForString(val);

    ssize_t res = indices != NULL && indices->size() > 0 ? indices->itemAt(0) : -1;

    if (kIsDebug) {

        printf("Offset for string %s: %zd (%s)\n", String8(val).string(), SSIZE(res),

        printf("Offset for string %s: %zd (%s)\n", String8(val).string(), res,

                res >= 0 ? String8(mEntries[mEntryArray[res]].value).string() : String8());

    }

    return res;

tools/aapt/XMLNode.cpp

+2 −5
Original line number Diff line number Diff line
@@ -16,13 +16,10 @@ 
#define O_BINARY 0

#endif



// SSIZE: mingw does not have signed size_t == ssize_t.

// STATUST: mingw does seem to redefine UNKNOWN_ERROR from our enum value, so a cast is necessary.

#if !defined(_WIN32)

#  define SSIZE(x) x

#  define STATUST(x) x

#else

#  define SSIZE(x) (signed size_t)x

#  define STATUST(x) (status_t)x

#endif
@@ -1426,7 +1423,7 @@ status_t XMLNode::collect_attr_strings(StringPool* outPool, 
                idx = outPool->add(attr.name);

                if (kIsDebug) {

                    printf("Adding attr %s (resid 0x%08x) to pool: idx=%zd\n",

                            String8(attr.name).string(), id, SSIZE(idx));

                            String8(attr.name).string(), id, idx);

                }

                if (id != 0) {

                    while ((ssize_t)outResIds->size() <= idx) {
@@ -1437,7 +1434,7 @@ status_t XMLNode::collect_attr_strings(StringPool* outPool, 
            }

            attr.namePoolIdx = idx;

            if (kIsDebug) {

                printf("String %s offset=0x%08zd\n", String8(attr.name).string(), SSIZE(idx));

                printf("String %s offset=0x%08zd\n", String8(attr.name).string(), idx);

            }

        }

    }