commit 1874e6557cbaf36e6893e502d4cdd7c645444b8f
author Mark Salyzyn <salyzyn@google.com> Thu Mar 13 16:38:43 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Mar 13 17:46:53 2014 -0700
tree 5aced1e4f7ef6a9ce8d2b65657816631bd99f717
parent 1a3798996b710370091419fd30b954bec5127e29

libdiskconfig: 64-bit issues

Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8

libdiskconfig/diskutils.c

diff --git a/libdiskconfig/diskutils.c b/libdiskconfig/diskutils.c
index e325735..7659632 100644
--- a/libdiskconfig/diskutils.c
+++ b/libdiskconfig/diskutils.c
@@ -19,13 +19,14 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <diskconfig/diskconfig.h>
 
@@ -35,8 +36,8 @@
     int dst_fd = -1;
     int src_fd = -1;
     uint8_t buffer[2048];
-    int nr_bytes;
-    int tmp;
+    ssize_t nr_bytes;
+    ssize_t tmp;
     int done = 0;
     uint64_t total = 0;
 
@@ -101,7 +102,7 @@
     if (dst_fd >= 0)
         fsync(dst_fd);
 
-    ALOGI("Wrote %llu bytes to %s @ %lld", total, dst, offset);
+    ALOGI("Wrote %" PRIu64 " bytes to %s @ %lld", total, dst, offset);
 
     close(src_fd);
     if (dst_fd >= 0)