From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 16 Aug 2017 17:50:25 +0000 (+0000)
Subject: tests: fix a few harmless -Woverflow compilation warnings
X-Git-Tag: v4.19~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cd860cc6cb217d5379a6403776e8dbc9663bfd8;p=strace

tests: fix a few harmless -Woverflow compilation warnings

Fix the following compilation warnings on platforms where
sizeof(struct timeval.tv_usec) < sizeof(long):

xettimeofday.c: In function ‘main’:
xettimeofday.c:76:16: warning: overflow in implicit constant conversion [-Woverflow]
  tv->tv_usec = (long) 0xbadc0dedfacefeedLL;
xetitimer.c: In function ‘main’:
xetitimer.c:170:28: warning: overflow in implicit constant conversion [-Woverflow]
  p_new->it_value.tv_usec = (long) 0xbadc0dedfacefeedLL;
In file included from utimes.c:38:0:
xutimes.c: In function ‘main’:
xutimes.c:110:18: warning: overflow in implicit constant conversion [-Woverflow]
  tv[1].tv_usec = (long) 0xbadc0dedfacefeedLL;
futimesat.c: In function ‘main’:
futimesat.c:121:18: warning: overflow in implicit constant conversion [-Woverflow]
  tv[1].tv_usec = (long) 0xbadc0dedfacefeedLL;
In file included from _newselect.c:35:0:
xselect.c: In function ‘main’:
xselect.c:94:16: warning: overflow in implicit constant conversion [-Woverflow]
  tv->tv_usec = (long) 0xbadc0dedfacefeedLL;
                ^
* tests/futimesat.c (main): In initialization of struct timeval.tv_usec,
change explicit cast from (long) to (suseconds_t).
* tests/xetitimer.c: Likewise.
* tests/xettimeofday.c: Likewise.
* tests/xselect.c: Likewise.
* tests/xutimes.c: Likewise.

Reported-by: Anatoly Pugachev <matorola@gmail.com>
---

diff --git a/tests/futimesat.c b/tests/futimesat.c
index 733fd09e..666ebdd8 100644
--- a/tests/futimesat.c
+++ b/tests/futimesat.c
@@ -118,7 +118,7 @@ main(void)
 	tv[0].tv_sec = 0xdeadbeefU;
 	tv[0].tv_usec = 0xfacefeedU;
 	tv[1].tv_sec = (time_t) 0xcafef00ddeadbeefLL;
-	tv[1].tv_usec = (long) 0xbadc0dedfacefeedLL;
+	tv[1].tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
 
 	k_futimesat(kfdcwd, kfname, (uintptr_t) tv);
 	printf("futimesat(AT_FDCWD, %s, [", qname);
diff --git a/tests/xetitimer.c b/tests/xetitimer.c
index 3a818803..f9cfe0b9 100644
--- a/tests/xetitimer.c
+++ b/tests/xetitimer.c
@@ -167,7 +167,7 @@ main(void)
 	p_new->it_interval.tv_sec = 0xdeadbeefU;
 	p_new->it_interval.tv_usec = 0xfacefeedU;
 	p_new->it_value.tv_sec = (time_t) 0xcafef00ddeadbeefLL;
-	p_new->it_value.tv_usec = (long) 0xbadc0dedfacefeedLL;
+	p_new->it_value.tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
 
 	rc = setitimer(ITIMER_REAL, p_new, p_old);
 	printf("setitimer(ITIMER_REAL"
diff --git a/tests/xettimeofday.c b/tests/xettimeofday.c
index ec422cf5..8652b24c 100644
--- a/tests/xettimeofday.c
+++ b/tests/xettimeofday.c
@@ -73,7 +73,7 @@ main(void)
 	       tz->tz_minuteswest, tz->tz_dsttime);
 
 	tv->tv_sec = (time_t) 0xcafef00ddeadbeefLL;
-	tv->tv_usec = (long) 0xbadc0dedfacefeedLL;
+	tv->tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
 	assert(syscall(__NR_settimeofday, tv, tz) == -1);
 	printf("settimeofday({tv_sec=%lld, tv_usec=%llu}"
 	       ", {tz_minuteswest=%d, tz_dsttime=%d}) = -1 EINVAL (%m)\n",
diff --git a/tests/xselect.c b/tests/xselect.c
index 6c8cd81e..a25ebcc6 100644
--- a/tests/xselect.c
+++ b/tests/xselect.c
@@ -91,7 +91,7 @@ int main(void)
 	FD_SET(fds[0], set);
 	FD_SET(fds[1], set);
 	tv->tv_sec = (time_t) 0xcafef00ddeadbeefLL;
-	tv->tv_usec = (long) 0xbadc0dedfacefeedLL;
+	tv->tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
 	memcpy(&tv_in, tv, sizeof(tv_in));
 	rc = syscall(TEST_SYSCALL_NR, fds[1] + 1, set, set, set, tv);
 	if (rc < 0) {
diff --git a/tests/xutimes.c b/tests/xutimes.c
index 5fd7161a..23728a1e 100644
--- a/tests/xutimes.c
+++ b/tests/xutimes.c
@@ -107,7 +107,7 @@ main(void)
 	tv[0].tv_sec = 0xdeadbeefU;
 	tv[0].tv_usec = 0xfacefeedU;
 	tv[1].tv_sec = (time_t) 0xcafef00ddeadbeefLL;
-	tv[1].tv_usec = (long) 0xbadc0dedfacefeedLL;
+	tv[1].tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
 
 	k_utimes(kfname, (uintptr_t) tv);
 	printf("%s(%s, [", TEST_SYSCALL_STR, qname);