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/res_debug.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/res_debug.c')
| -rw-r--r-- | resolv/res_debug.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/resolv/res_debug.c b/resolv/res_debug.c index a4fbc569b6..7681ad4639 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -1052,6 +1052,7 @@ dn_count_labels(const char *name) { libresolv_hidden_def (__dn_count_labels) +#if SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27) /* * Make dates expressed in seconds-since-Jan-1-1970 easy to read. * SIG records are required to be printed like this, by the Secure DNS RFC. @@ -1059,7 +1060,7 @@ libresolv_hidden_def (__dn_count_labels) * signed 32-bit range. */ char * -p_secstodate (u_long secs) { +__p_secstodate (u_long secs) { /* XXX nonreentrant */ static char output[15]; /* YYYYMMDDHHMMSS and null */ time_t clock = secs; @@ -1084,13 +1085,14 @@ p_secstodate (u_long secs) { that, even given range checks on all fields with __builtin_unreachable called for out-of-range values. */ DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (7, 0) +# if __GNUC_PREREQ (7, 0) DIAG_IGNORE_NEEDS_COMMENT (8, "-Wformat-overflow="); -#endif +# endif sprintf(output, "%04d%02d%02d%02d%02d%02d", time->tm_year, time->tm_mon, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec); DIAG_POP_NEEDS_COMMENT; return (output); } -libresolv_hidden_def (__p_secstodate) +compat_symbol (libresolv, __p_secstodate, __p_secstodate, GLIBC_2_0); +#endif |