about summary refs log tree commit diff
path: root/resolv/resolv.h
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/resolv.h
parentf120cda6072d830df92656dad0c89967547b97dc (diff)
downloadglibc-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/resolv.h')
-rw-r--r--resolv/resolv.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/resolv/resolv.h b/resolv/resolv.h
index e8c581ccd1..80a523e5e4 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -213,7 +213,6 @@ __END_DECLS
 #define p_fqname		__p_fqname
 #define p_fqnname		__p_fqnname
 #define p_option		__p_option
-#define p_secstodate		__p_secstodate
 #define p_time			__p_time
 #define p_type			__p_type
 #define p_rcode			__p_rcode
@@ -268,7 +267,6 @@ const unsigned char * p_fqnname (const unsigned char *__cp,
 const unsigned char * p_fqname (const unsigned char *,
 				const unsigned char *, FILE *) __THROW;
 const char *	p_option (unsigned long __option) __THROW;
-char *		p_secstodate (unsigned long) __THROW;
 int		dn_count_labels (const char *) __THROW;
 int		dn_comp (const char *, unsigned char *, int, unsigned char **,
 			 unsigned char **) __THROW;