diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-11-22 22:21:10 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-11-22 22:21:10 +0000 |
| commit | 754034c4292ba6824ef357258308e6bafa6e0dfd (patch) | |
| tree | 76928bd635c8aa865701105d27f5ceda027fe4f9 /resolv/ns_print.c | |
| parent | f120cda6072d830df92656dad0c89967547b97dc (diff) | |
| download | glibc-754034c4292ba6824ef357258308e6bafa6e0dfd.tar.gz glibc-754034c4292ba6824ef357258308e6bafa6e0dfd.tar.xz glibc-754034c4292ba6824ef357258308e6bafa6e0dfd.zip | |
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/ns_print.c')
| -rw-r--r-- | resolv/ns_print.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolv/ns_print.c b/resolv/ns_print.c index f55680c311..d61f5044b1 100644 --- a/resolv/ns_print.c +++ b/resolv/ns_print.c @@ -488,12 +488,12 @@ ns_sprintrrf(const u_char *msg, size_t msglen, /* Inception. */ t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); + len = SPRINTF((tmp, "%lu ", t)); T(addstr(tmp, len, &buf, &buflen)); /* Experation. */ t = ns_get32(rdata); rdata += NS_INT32SZ; - len = SPRINTF((tmp, "%s ", p_secstodate(t))); + len = SPRINTF((tmp, "%lu ", t)); T(addstr(tmp, len, &buf, &buflen)); /* Mode , Error, Key Size. */ |