mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
eb669ff5bf
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>
60 lines
2.1 KiB
C
60 lines
2.1 KiB
C
/* Support code for timespec checks.
|
|
Copyright (C) 2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <support/timespec.h>
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
|
|
void
|
|
test_timespec_before_impl (const char *file, int line,
|
|
const struct timespec left,
|
|
const struct timespec right)
|
|
{
|
|
if (left.tv_sec > right.tv_sec
|
|
|| (left.tv_sec == right.tv_sec
|
|
&& left.tv_nsec > right.tv_nsec)) {
|
|
support_record_failure ();
|
|
const struct timespec diff = timespec_sub (left, right);
|
|
printf ("%s:%d: %jd.%09jds not before %jd.%09jds "
|
|
"(difference %jd.%09jds)n",
|
|
file, line,
|
|
(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);
|
|
}
|
|
}
|
|
|
|
void
|
|
test_timespec_equal_or_after_impl (const char *file, int line,
|
|
const struct timespec left,
|
|
const struct timespec right)
|
|
{
|
|
if (left.tv_sec < right.tv_sec
|
|
|| (left.tv_sec == right.tv_sec
|
|
&& left.tv_nsec < right.tv_nsec)) {
|
|
support_record_failure ();
|
|
const struct timespec diff = timespec_sub (right, left);
|
|
printf ("%s:%d: %jd.%09jds not after %jd.%09jds "
|
|
"(difference %jd.%09jds)n",
|
|
file, line,
|
|
(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);
|
|
}
|
|
}
|