2004-10-07 Roland McGrath <roland@redhat.com>
* file.c (sys_llssek, sys_readahead, sys_fadvise64, sys_fadvise64_64):
Use LONG_LONG macro.
* io.c (sys_pread, sys_pwrite, sys_sendfile): Likewise.
diff --git a/io.c b/io.c
index 086d028..86f9abe 100644
--- a/io.c
+++ b/io.c
@@ -161,8 +161,7 @@
tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
#else
tprintf(", %lu, %llu", tcp->u_arg[2],
- (((unsigned long long) tcp->u_arg[4]) << 32
- | (unsigned) tcp->u_arg[3]));
+ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
#endif
}
return 0;
@@ -180,8 +179,7 @@
tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
#else
tprintf(", %lu, %llu", tcp->u_arg[2],
- (((unsigned long long) tcp->u_arg[4]) << 32
- | (unsigned) tcp->u_arg[3]));
+ LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
#endif
}
return 0;
@@ -198,8 +196,8 @@
{
if (entering(tcp)) {
tprintf("%ld, %ld, %llu, %lu", tcp->u_arg[0], tcp->u_arg[1],
- (((unsigned long long) tcp->u_arg[3]) << 32 |
- (unsigned) tcp->u_arg[2]), tcp->u_arg[4]);
+ LONG_LONG(tcp->u_arg[2], tcp->u_arg[3]),
+ tcp->u_arg[4]);
} else {
off_t offset;