From a742bdb3fd6f5ebaa730824eda7fcfe7faedb451 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 24 Jul 2017 01:19:36 +0200 Subject: [PATCH] Rename module 'strftime' to 'nstrftime'. * m4/nstrftime.m4: Renamed from m4/strftime.m4. * lib/nstrftime.c: Renamed from lib/strftime.c. * modules/nstrftime: Renamed from modules/strftime. (Files, Makefile.am): Update. * tests/test-nstrftime.c: Renamed from tests/test-strftime.c. Fix comment. * modules/nstrftime-tests: Renamed from modules/strftime-tests. (Files, Makefile.am): Update. * modules/strftime: New file, an obsolete indirection. * doc/posix-functions/strftime.texi: Update reference. * config/srclist.txt: Update info. --- ChangeLog | 15 +++++++++++ config/srclist.txt | 2 +- doc/posix-functions/strftime.texi | 2 +- lib/{strftime.c => nstrftime.c} | 0 m4/{strftime.m4 => nstrftime.m4} | 0 modules/nstrftime | 28 +++++++++++++++++++++ modules/nstrftime-tests | 12 +++++++++ modules/strftime | 18 ++++++------- modules/strftime-tests | 12 --------- tests/{test-strftime.c => test-nstrftime.c} | 2 +- 10 files changed, 66 insertions(+), 25 deletions(-) rename lib/{strftime.c => nstrftime.c} (100%) rename m4/{strftime.m4 => nstrftime.m4} (100%) create mode 100644 modules/nstrftime create mode 100644 modules/nstrftime-tests delete mode 100644 modules/strftime-tests rename tests/{test-strftime.c => test-nstrftime.c} (99%) diff --git a/ChangeLog b/ChangeLog index 0f0acdce3b..6b81952418 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2017-07-23 Bruno Haible + + Rename module 'strftime' to 'nstrftime'. + * m4/nstrftime.m4: Renamed from m4/strftime.m4. + * lib/nstrftime.c: Renamed from lib/strftime.c. + * modules/nstrftime: Renamed from modules/strftime. + (Files, Makefile.am): Update. + * tests/test-nstrftime.c: Renamed from tests/test-strftime.c. + Fix comment. + * modules/nstrftime-tests: Renamed from modules/strftime-tests. + (Files, Makefile.am): Update. + * modules/strftime: New file, an obsolete indirection. + * doc/posix-functions/strftime.texi: Update reference. + * config/srclist.txt: Update info. + 2017-07-21 Tim Rühsen malloca: Silence a warning from clang's memory sanitizer. diff --git a/config/srclist.txt b/config/srclist.txt index ae24d4a3d1..bf6e4a2a56 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -233,7 +233,7 @@ $GETTEXT gettext-runtime/po/remove-potcdate.sin build-aux/po release #$LIBCSRC sysdeps/unix/bsd/unlockpt.c lib gpl #$LIBCSRC sysdeps/unix/dirfd.c lib gpl #$LIBCSRC sysdeps/unix/grantpt.c lib gpl -#$LIBCSRC sysdeps/unix/rmdir.c lib gpl +#$LIBCSRC sysdeps/unix/rmdir.c lib gpl (nstrftime.c in gnulib) #$LIBCSRC time/strftime.c lib gpl # These are close, but we are using the gettext versions. #$LIBCSRC misc/mkdtemp.c lib gpl diff --git a/doc/posix-functions/strftime.texi b/doc/posix-functions/strftime.texi index dd52720499..40e391addc 100644 --- a/doc/posix-functions/strftime.texi +++ b/doc/posix-functions/strftime.texi @@ -24,5 +24,5 @@ Native Windows platforms (mingw, MSVC) support only a subset of time zones supported by GNU or specified by POSIX. @xref{tzset}. @end itemize -Extension: Gnulib offers a module @samp{strftime} that provides an +Extension: Gnulib offers a module @samp{nstrftime} that provides an @code{nstrftime} function with various GNU extensions. diff --git a/lib/strftime.c b/lib/nstrftime.c similarity index 100% rename from lib/strftime.c rename to lib/nstrftime.c diff --git a/m4/strftime.m4 b/m4/nstrftime.m4 similarity index 100% rename from m4/strftime.m4 rename to m4/nstrftime.m4 diff --git a/modules/nstrftime b/modules/nstrftime new file mode 100644 index 0000000000..b559b5e205 --- /dev/null +++ b/modules/nstrftime @@ -0,0 +1,28 @@ +Description: +nstrftime() function: convert date and time to string, with GNU extensions. + +Files: +lib/strftime.h +lib/nstrftime.c +m4/tm_gmtoff.m4 +m4/nstrftime.m4 + +Depends-on: +extensions +stdbool +time_rz + +configure.ac: +gl_FUNC_GNU_STRFTIME + +Makefile.am: +lib_SOURCES += nstrftime.c + +Include: +"strftime.h" + +License: +LGPL + +Maintainer: +Jim Meyering, glibc diff --git a/modules/nstrftime-tests b/modules/nstrftime-tests new file mode 100644 index 0000000000..708b510d27 --- /dev/null +++ b/modules/nstrftime-tests @@ -0,0 +1,12 @@ +Files: +tests/test-nstrftime.c +tests/macros.h + +Depends-on: +strerror + +configure.ac: + +Makefile.am: +TESTS += test-nstrftime +check_PROGRAMS += test-nstrftime diff --git a/modules/strftime b/modules/strftime index b54f44eda0..6384ee4db2 100644 --- a/modules/strftime +++ b/modules/strftime @@ -1,22 +1,20 @@ Description: nstrftime() function: convert date and time to string, with GNU extensions. +Status: +obsolete + +Notice: +This module is obsolete. Use module 'nstrftime' instead. + Files: -lib/strftime.h -lib/strftime.c -m4/tm_gmtoff.m4 -m4/strftime.m4 Depends-on: -extensions -stdbool -time_rz +nstrftime configure.ac: -gl_FUNC_GNU_STRFTIME Makefile.am: -lib_SOURCES += strftime.c Include: "strftime.h" @@ -25,4 +23,4 @@ License: LGPL Maintainer: -Jim Meyering, glibc +all diff --git a/modules/strftime-tests b/modules/strftime-tests deleted file mode 100644 index 17f7001784..0000000000 --- a/modules/strftime-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-strftime.c -tests/macros.h - -Depends-on: -strerror - -configure.ac: - -Makefile.am: -TESTS += test-strftime -check_PROGRAMS += test-strftime diff --git a/tests/test-strftime.c b/tests/test-nstrftime.c similarity index 99% rename from tests/test-strftime.c rename to tests/test-nstrftime.c index 102e168051..85af8a661e 100644 --- a/tests/test-strftime.c +++ b/tests/test-nstrftime.c @@ -1,4 +1,4 @@ -/* Test that posixtime works as required. +/* Test that nstrftime works as required. Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify -- 2.39.5