commit fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8
author Mark Salyzyn <salyzyn@google.com> Fri Mar 14 21:02:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 21:02:50 2014 +0000
tree a3697e4ae2a5aa4cf3e040a49af8bd6b26606d9c
parent 176bf95b4e37413d143fbdcf709605b8d6fb7990
parent 8b8974ef566599aebfc4d8614bc8d18ecffad652

am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit '8b8974ef566599aebfc4d8614bc8d18ecffad652':
  toolbox: ls: 64 bit compile warnings

toolbox/ls.c

diff --git a/toolbox/ls.c b/toolbox/ls.c
index 3cc5bb2..06910ee 100644
--- a/toolbox/ls.c
+++ b/toolbox/ls.c
@@ -137,7 +137,7 @@
 
     /* blocks are 512 bytes, we want output to be KB */
     if ((flags & LIST_SIZE) != 0) {
-        printf("%lld ", s->st_blocks / 2);
+        printf("%lld ", (long long)s->st_blocks / 2);
     }
 
     if ((flags & LIST_CLASSIFY) != 0) {
@@ -205,7 +205,7 @@
         break;
     case S_IFREG:
         printf("%s %-8s %-8s %8lld %s %s\n",
-               mode, user, group, s->st_size, date, name);
+               mode, user, group, (long long)s->st_size, date, name);
         break;
     case S_IFLNK: {
         char linkto[256];
@@ -321,7 +321,7 @@
     }
 
     if(flags & LIST_INODE) {
-        printf("%8llu ", s.st_ino);
+        printf("%8llu ", (unsigned long long)s.st_ino);
     }
 
     if ((flags & LIST_MACLABEL) != 0) {