Blame e2tools-printf-lld-64bit.patch
|
 |
5a8174c |
Caution: Checking __WORDSIZE == 64 is not enough.
|
|
|
5a8174c |
|
|
|
5a8174c |
On x86_64, << printf("%7" PRIu64, (__u64)1); >> lets gcc throw a warning.
|
|
|
5a8174c |
__u64 seems to be a long int; uint64_t a long long int; PRIu64 "llu".
|
|
|
5a8174c |
So __u64 is not compatible with PRIu64, even though it is a 64bit value.
|
|
|
5a8174c |
|
|
|
5a8174c |
diff -ru e2tools-0.0.16-orig/ls.c e2tools-0.0.16-lld/ls.c
|
|
|
5a8174c |
--- e2tools-0.0.16-orig/ls.c 2007-12-08 23:57:40.000000000 +0100
|
|
|
5a8174c |
+++ e2tools-0.0.16-lld/ls.c 2007-12-09 03:10:24.000000000 +0100
|
|
|
5a8174c |
@@ -44,6 +44,8 @@
|
|
|
5a8174c |
#include "e2tools.h"
|
|
|
5a8174c |
#include "elist.h"
|
|
|
5a8174c |
#include <regex.h>
|
|
|
5a8174c |
+#include <stdint.h>
|
|
|
5a8174c |
+#include <inttypes.h>
|
|
|
5a8174c |
|
|
|
5a8174c |
/*
|
|
|
5a8174c |
* list directory
|
|
|
5a8174c |
@@ -657,8 +659,8 @@
|
|
|
5a8174c |
if (LINUX_S_ISDIR(info->inode.i_mode))
|
|
|
5a8174c |
printf("%7d", info->inode.i_size);
|
|
|
5a8174c |
else
|
|
|
5a8174c |
- printf("%7lld", info->inode.i_size |
|
|
|
5a8174c |
- ((__u64)info->inode.i_size_high << 32));
|
|
|
5a8174c |
+ printf("%7" PRIu64, (uint64_t)(info->inode.i_size |
|
|
|
5a8174c |
+ ((__u64)info->inode.i_size_high << 32)));
|
|
|
5a8174c |
printf(" %s %s\n", datestr, info->name);
|
|
|
5a8174c |
|
|
|
5a8174c |
} /* end of long_disp */
|