diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-14 21:35:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 21:35:41 +0000 |
| commit | 731e24e99f28a52bc73d1603d2934f5eeb443b5d (patch) | |
| tree | ad928d60e3bc1e4a9242e9abd49a33a299affa85 /toolbox | |
| parent | c5036da72c1436000bbc764fecd7693ff1c293e6 (diff) | |
| parent | fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8 (diff) | |
| download | system_core-731e24e99f28a52bc73d1603d2934f5eeb443b5d.zip system_core-731e24e99f28a52bc73d1603d2934f5eeb443b5d.tar.gz system_core-731e24e99f28a52bc73d1603d2934f5eeb443b5d.tar.bz2 | |
am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"
* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
toolbox: ls: 64 bit compile warnings
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/ls.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ static int listfile_size(const char *path, const char *filename, struct stat *s, /* 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 @@ static int listfile_long(const char *path, struct stat *s, int flags) 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 @@ static int listfile(const char *dirname, const char *filename, int flags) } if(flags & LIST_INODE) { - printf("%8llu ", s.st_ino); + printf("%8llu ", (unsigned long long)s.st_ino); } if ((flags & LIST_MACLABEL) != 0) { |