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

Commit e1f0518a authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Use %zu to print size_t" 

am: 46d0bb74

Change-Id: I4a5d2dac218a120f03c1ff8456fa749111117de7
parents bcb1f85c 46d0bb74

drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ namespace android { 


    ssize_t MockDrmPlugin::findSession(Vector<uint8_t> const &sessionId) const

    {

        ALOGD("findSession: nsessions=%d, size=%d", mSessions.size(), sessionId.size());

        ALOGD("findSession: nsessions=%zu, size=%zu", mSessions.size(), sessionId.size());

        for (size_t i = 0; i < mSessions.size(); ++i) {

            if (memcmp(mSessions[i].array(), sessionId.array(), sessionId.size()) == 0) {

                return i;
@@ -740,7 +740,7 @@ namespace android { 


    ssize_t MockDrmPlugin::findKeySet(Vector<uint8_t> const &keySetId) const

    {

        ALOGD("findKeySet: nkeySets=%d, size=%d", mKeySets.size(), keySetId.size());

        ALOGD("findKeySet: nkeySets=%zu, size=%zu", mKeySets.size(), keySetId.size());

        for (size_t i = 0; i < mKeySets.size(); ++i) {

            if (memcmp(mKeySets[i].array(), keySetId.array(), keySetId.size()) == 0) {

                return i;