From: Roland McGrath <roland@redhat.com>
Date: Thu, 7 Oct 2004 19:09:16 +0000 (+0000)
Subject: 2004-10-07  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~490
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fe2a3e124c10a958f8738d03df7c01cc283e531;p=strace

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/file.c b/file.c
index 4428a5b9..2f1275a4 100644
--- a/file.c
+++ b/file.c
@@ -433,12 +433,10 @@ struct tcb *tcp;
     if (entering(tcp)) {
 	if (tcp->u_arg[4] == SEEK_SET)
 	    tprintf("%ld, %llu, ", tcp->u_arg[0],
-		    (((long long int) tcp->u_arg[1]) << 32
-		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
+		    LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]));
 	else
 	    tprintf("%ld, %lld, ", tcp->u_arg[0],
-		    (((long long int) tcp->u_arg[1]) << 32
-		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
+		    LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]));
     }
     else {
 	long long int off;
@@ -460,9 +458,7 @@ struct tcb *tcp;
 # if defined IA64 || defined X86_64 || defined ALPHA
 		(long long int) tcp->u_arg[1], tcp->u_arg[2]
 # else
-		(((long long int) tcp->u_arg[1]) << 32
-		 | ((unsigned long *) tcp->u_arg)[2]),
-		tcp->u_arg[3]
+		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3]
 # endif
 		);
     }
@@ -2497,9 +2493,8 @@ struct tcb *tcp;
 		(long long int) tcp->u_arg[1], tcp->u_arg[2]);
 	printxval(advise, tcp->u_arg[3], "POSIX_FADV_???");
 #else
-		((long long int) tcp->u_arg[2] << 32) | tcp->u_arg[1],
-		tcp->u_arg[3]);
-	printxval (advise, tcp->u_arg[4], "POSIX_FADV_???");
+		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]), tcp->u_arg[3]);
+	printxval(advise, tcp->u_arg[4], "POSIX_FADV_???");
 #endif
     }
     return 0;
@@ -2518,8 +2513,8 @@ struct tcb *tcp;
 		(long long int) tcp->u_arg[1], (long long int) tcp->u_arg[2]);
 	printxval(advise, tcp->u_arg[3], "POSIX_FADV_???");
 #else
-		((long long int) tcp->u_arg[2] << 32) | tcp->u_arg[1],
-		((long long int) tcp->u_arg[4] << 32) | tcp->u_arg[3]);
+		LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]),
+		LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
 	printxval(advise, tcp->u_arg[5], "POSIX_FADV_???");
 #endif
     }
diff --git a/io.c b/io.c
index 086d0283..86f9abe0 100644
--- a/io.c
+++ b/io.c
@@ -161,8 +161,7 @@ struct tcb *tcp;
 		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 @@ struct tcb *tcp;
 		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 @@ struct tcb *tcp;
 {
 	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;