From 754034c4292ba6824ef357258308e6bafa6e0dfd Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Nov 2017 22:21:10 +0000 Subject: Obsolete p_secstodate. This patch, relative to a tree with (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 . 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. --- include/resolv.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/resolv.h b/include/resolv.h index 634f552..daf4a74 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -65,7 +65,6 @@ libresolv_hidden_proto (__res_nameinquery) libresolv_hidden_proto (__res_queriesmatch) libresolv_hidden_proto (__b64_ntop) libresolv_hidden_proto (__dn_count_labels) -libresolv_hidden_proto (__p_secstodate) # endif /* _RESOLV_H_ && !_ISOMAC */ #endif -- cgit v1.1