summaryrefslogtreecommitdiff
path: root/resolv/tst-p_secstodate.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-11-22 22:21:10 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-11-22 22:21:10 +0000
commit754034c4292ba6824ef357258308e6bafa6e0dfd (patch)
tree76928bd635c8aa865701105d27f5ceda027fe4f9 /resolv/tst-p_secstodate.c
parentf120cda6072d830df92656dad0c89967547b97dc (diff)
Obsolete p_secstodate.
This patch, relative to a tree with <https://sourceware.org/ml/libc-alpha/2017-11/msg00797.html> (pending review) applied, obsoletes p_secstodate, making the underlying function __p_secstodate into a compat symbol not available for new binaries or ports. The calls in ns_print.c (part of incomplete handling of TKEY) are changed to use %lu to print times instead of trying to pretty-print the times any more. Tested for x86_64. * resolv/res_debug.c (p_secstodate): Condition definition on [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)]. Define directly as __p_secstodate, and as a compat symbol. Do not use libresolv_hidden_def. * resolv/resolv.h (p_secstodate): Remove macro and function declaration. * resolv/ns_print.c (ns_sprintrrf): Print times with %lu, not using p_secstodate. * include/resolv.h (__p_secstodate): Do not use libresolv_hidden_proto. * resolv/Makefile (tests): Move tst-p_secstodate to .... (tests-internal): ... here. * resolv/tst-p_secstodate.c: Include <shlib-compat.h>. Condition all contents on [TEST_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)] and declare and use __p_secstodate and use compat_symbol_reference in that case. [!TEST_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)] (do_test): Add implementation returning 77.
Diffstat (limited to 'resolv/tst-p_secstodate.c')
-rw-r--r--resolv/tst-p_secstodate.c27
1 files changed, 22 insertions, 5 deletions
diff --git a/resolv/tst-p_secstodate.c b/resolv/tst-p_secstodate.c
index 9dac1ad819..98e4d1f108 100644
--- a/resolv/tst-p_secstodate.c
+++ b/resolv/tst-p_secstodate.c
@@ -1,4 +1,4 @@
-/* Test p_secstodate.
+/* Test __p_secstodate compat symbol.
Copyright (C) 2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -23,9 +23,16 @@
#include <stdio.h>
#include <string.h>
+#include <shlib-compat.h>
+
+#if TEST_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)
+
+char *__p_secstodate (unsigned long int);
+compat_symbol_reference (libresolv, __p_secstodate, __p_secstodate, GLIBC_2_0);
+
struct test
{
- /* Argument to p_secstodate. */
+ /* Argument to __p_secstodate. */
unsigned long int in;
/* Expected output. */
const char *out;
@@ -39,12 +46,12 @@ static const struct test tests[] =
{ 2147483647UL, "20380119031407" },
{ 2147483648UL, "<overflow>" },
{ 4294967295UL, "<overflow>" },
-#if ULONG_MAX > 0xffffffffUL
+# if ULONG_MAX > 0xffffffffUL
{ 4294967296UL, "<overflow>" },
{ 9999999999UL, "<overflow>" },
{ LONG_MAX, "<overflow>" },
{ ULONG_MAX, "<overflow>" },
-#endif
+# endif
};
static int
@@ -53,7 +60,7 @@ do_test (void)
int ret = 0;
for (size_t i = 0; i < array_length (tests); i++)
{
- char *p = p_secstodate (tests[i].in);
+ char *p = __p_secstodate (tests[i].in);
printf ("Test %zu: %lu -> %s\n", i, tests[i].in, p);
if (strcmp (p, tests[i].out) != 0)
{
@@ -64,4 +71,14 @@ do_test (void)
return ret;
}
+#else
+
+static int
+do_test (void)
+{
+ return 77;
+}
+
+#endif
+
#include <support/test-driver.c>