system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

support: Fix timespec printf

Browse Source 
The patch print timespec members as intmax_t instead of long int.
It avoid the -Werror=format= build issue on x32:

  timespec.c: In function 'test_timespec_before_impl':
  timespec.c:32:23: error: format '%ld' expects argument of type 'long int',
  but argument 4 has type '__time_t' {aka 'const long long int'} [-Werror=format=]

Checked on x86_64-linux-gnu-x32, x86_64-linux-gnu, and i686-linux-gnu.

	* support/timespec.c (test_timespec_before_impl,
	test_timespec_equal_or_after_impl): print timespec member as intmax_t
	insted of long int.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Adhemerval Zanella 2019-05-10 09:35:18 -03:00
parent 44ac6ee97a
commit eb669ff5bf
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2019-05-09 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* support/timespec.c (test_timespec_before_impl,
test_timespec_equal_or_after_impl): print timespec member as intmax_t
insted of long int.
2019-05-09 Mike Crowe <mac@mcrowe.com>
* nptl/tst-abstime.c: Use libsupport.

21
support/timespec.c
View File

@ -18,6 +18,7 @@
#include <support/timespec.h>
#include <stdio.h>
#include <stdint.h>
void
test_timespec_before_impl (const char *file, int line,
@ -29,12 +30,12 @@ test_timespec_before_impl (const char *file, int line,
&& left.tv_nsec > right.tv_nsec)) {
support_record_failure ();
const struct timespec diff = timespec_sub (left, right);
printf ("%s:%d: %ld.%09lds not before %ld.%09lds "
"(difference %ld.%09lds)n",
printf ("%s:%d: %jd.%09jds not before %jd.%09jds "
"(difference %jd.%09jds)n",
file, line,
left.tv_sec, left.tv_nsec,
right.tv_sec, right.tv_nsec,
diff.tv_sec, diff.tv_nsec);
(intmax_t) left.tv_sec, (intmax_t) left.tv_nsec,
(intmax_t) right.tv_sec, (intmax_t) right.tv_nsec,
(intmax_t) diff.tv_sec, (intmax_t) diff.tv_nsec);
}
}
@ -48,11 +49,11 @@ test_timespec_equal_or_after_impl (const char *file, int line,
&& left.tv_nsec < right.tv_nsec)) {
support_record_failure ();
const struct timespec diff = timespec_sub (right, left);
printf ("%s:%d: %ld.%09lds not after %ld.%09lds "
"(difference %ld.%09lds)n",
printf ("%s:%d: %jd.%09jds not after %jd.%09jds "
"(difference %jd.%09jds)n",
file, line,
left.tv_sec, left.tv_nsec,
right.tv_sec, right.tv_nsec,
diff.tv_sec, diff.tv_nsec);
(intmax_t) left.tv_sec, (intmax_t) left.tv_nsec,
(intmax_t) right.tv_sec, (intmax_t) right.tv_nsec,
(intmax_t) diff.tv_sec, (intmax_t) diff.tv_nsec);
}
}