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

Commit a58ea944 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

Fix format string warnings 

MockCasPlugin.cpp: These are printing out `size_t`s, so we should be
using %zu.

ClearKeyFetcher.cpp: asset_.id() is an `unsigned long long`, so we
can't use PRIu64 for it.

Bug: None
Test: mma. Warnings are gone.
Merged-In: Ie34acb274696dea999f6309fb914b39ef00f4d77
(cherry picked from commit 843328ff)

Change-Id: I7be4fff7d3fd603b7ab64397a6a05c28f7a34ace
parent aba76c0d

drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ status_t ClearKeyFetcher::ObtainKey(const sp<ABuffer>& buffer, 
    // asset_id change. If it sends an EcmContainer with 2 Ecms with different

    // asset_ids (old and new) then it might be best to prefetch the Emm.

    if ((asset_.id() != 0) && (*asset_id != asset_.id())) {

        ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id);

        ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id);

        asset_.Clear();

    }

drm/mediacas/plugins/mock/MockCasPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ status_t MockCasPlugin::processEcm( 
    if (session == NULL) {

        return BAD_VALUE;

    }

    ALOGV("ECM: size=%d", ecm.size());

    ALOGV("ECM: size=%zu", ecm.size());

    ALOGV("ECM: data=%s", arrayToString(ecm).string());



    return OK;
@@ -156,7 +156,7 @@ status_t MockCasPlugin::processEmm(const CasEmm& emm) { 
    ALOGV("processEmm");

    Mutex::Autolock lock(mLock);



    ALOGV("EMM: size=%d", emm.size());

    ALOGV("EMM: size=%zu", emm.size());

    ALOGV("EMM: data=%s", arrayToString(emm).string());



    return OK;