commit ce3c0609620f02621efb7531811e55c2295c2ade
author Colin Cross <ccross@android.com> Thu Sep 22 15:14:23 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 22 15:14:23 2016 +0000
tree 0cc9329331df79de86c1b22a2a7c770702298ad6
parent f881bb5247059ff03253c3fbe762487354c0d9b5
parent abe67dd75cce255d3449ce9af5fa37109c83444e

Merge "Fix format warnings in hardware/qcom/display"

msm8994/libgralloc/mapper.cpp

diff --git a/msm8994/libgralloc/mapper.cpp b/msm8994/libgralloc/mapper.cpp
index 90fe3e9..dd05724 100644
--- a/msm8994/libgralloc/mapper.cpp
+++ b/msm8994/libgralloc/mapper.cpp
@@ -136,7 +136,7 @@
     if(hnd->base) {
         err = memalloc->unmap_buffer((void*)hnd->base, hnd->size, hnd->offset);
         if (err) {
-            ALOGE("Could not unmap memory at address %p, %s", hnd->base,
+            ALOGE("Could not unmap memory at address %p, %s", (void*) hnd->base,
                     strerror(errno));
             return -errno;
         }
@@ -149,7 +149,7 @@
                 size, hnd->offset_metadata);
         if (err) {
             ALOGE("Could not unmap memory at address %p, %s",
-                    hnd->base_metadata, strerror(errno));
+                    (void*) hnd->base_metadata, strerror(errno));
             return -errno;
         }
         hnd->base_metadata = 0;

msm8994/libhdmi/hdmi.cpp

diff --git a/msm8994/libhdmi/hdmi.cpp b/msm8994/libhdmi/hdmi.cpp
index c8d36ef..6a91975 100644
--- a/msm8994/libhdmi/hdmi.cpp
+++ b/msm8994/libhdmi/hdmi.cpp
@@ -783,7 +783,7 @@
 int HDMIDisplay::getDisplayConfigs(uint32_t* configs,
         size_t* numConfigs) const {
     if (*numConfigs <= 0) {
-        ALOGE("%s Invalid number of configs (%d)", __FUNCTION__, *numConfigs);
+        ALOGE("%s Invalid number of configs (%zu)", __FUNCTION__, *numConfigs);
         return -EINVAL;
     }
     *numConfigs = mModeCount;

msm8994/libhwcomposer/hwc.cpp

diff --git a/msm8994/libhwcomposer/hwc.cpp b/msm8994/libhwcomposer/hwc.cpp
index 67da2e5..a8a248d 100644
--- a/msm8994/libhwcomposer/hwc.cpp
+++ b/msm8994/libhwcomposer/hwc.cpp
@@ -794,7 +794,7 @@
     }
 
     if (*numConfigs <= 0) {
-        ALOGE("%s Invalid number of configs (%d)", __FUNCTION__, *numConfigs);
+        ALOGE("%s Invalid number of configs (%zu)", __FUNCTION__, *numConfigs);
         return -EINVAL;
     }
 

msm8994/libhwcomposer/hwc_mdpcomp.cpp

diff --git a/msm8994/libhwcomposer/hwc_mdpcomp.cpp b/msm8994/libhwcomposer/hwc_mdpcomp.cpp
index 4c7c7ad..5549d30 100644
--- a/msm8994/libhwcomposer/hwc_mdpcomp.cpp
+++ b/msm8994/libhwcomposer/hwc_mdpcomp.cpp
@@ -1401,7 +1401,7 @@
         /* Bail out if we are processing only secured video/ui layers
          * and we dont have any */
         if(secureOnly) {
-            ALOGD_IF(isDebug(), "%s: No secure video/ui layers");
+            ALOGD_IF(isDebug(), "%s: No secure video/ui layers", __FUNCTION__);
             return false;
         }
         /* No Idle fall back for secure video/ui layers and if there is only