commit f741c672bade253f172c642049a3b8f25d3bcb22
author Sean Paul <seanpaul@chromium.org> Wed May 11 13:49:38 2016 -0400
committer Sean Paul <seanpaul@chromium.org> Wed May 11 13:49:38 2016 -0400
tree 718046cfa0b4f2ca17366e4e5e8b7db2bfef3bae
parent 0aee6b2afa33652722641cbf3d4cc1689e1baa1b

drm_hwcomposer: Fix up some printf warnings and a clang-style nit

BUG=None
TEST=Compiles

Change-Id: Ie95aad60b225784c36d411ec16a34ff32ea8acc6
Signed-off-by: Sean Paul <seanpaul@chromium.org>

drmresources.cpp

diff --git a/drmresources.cpp b/drmresources.cpp
index 81381c3..e433239 100644
--- a/drmresources.cpp
+++ b/drmresources.cpp
@@ -23,6 +23,7 @@
 #include "drmplane.h"
 #include "drmresources.h"
 
+#include <cinttypes>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdint.h>
@@ -321,7 +322,7 @@
   destroy_blob.blob_id = (__u32)blob_id;
   int ret = drmIoctl(fd(), DRM_IOCTL_MODE_DESTROYPROPBLOB, &destroy_blob);
   if (ret) {
-    ALOGE("Failed to destroy mode property blob %ld/%d", blob_id, ret);
+    ALOGE("Failed to destroy mode property blob %" PRIu32 "/%d", blob_id, ret);
     return ret;
   }
   return 0;
@@ -348,7 +349,7 @@
 
 int DrmResources::SetDpmsMode(int display, uint64_t mode) {
   if (mode != DRM_MODE_DPMS_ON && mode != DRM_MODE_DPMS_OFF) {
-    ALOGE("Invalid dpms mode %d", mode);
+    ALOGE("Invalid dpms mode %" PRIu64, mode);
     return -EINVAL;
   }
 
@@ -359,7 +360,8 @@
   }
   int ret = comp->SetDpmsMode(display, mode);
   if (ret) {
-    ALOGE("Failed to add dpms %ld to composition on %d %d", mode, display, ret);
+    ALOGE("Failed to add dpms %" PRIu64 " to composition on %d %d", mode,
+          display, ret);
     return ret;
   }
   ret = compositor_.QueueComposition(std::move(comp));