From: Bruno Haible <bruno@clisp.org> Date: Thu, 3 Nov 2022 12:32:42 +0000 (+0100) Subject: dynarray: Rename to glibc-internal/dynarray. X-Git-Tag: v1.0~1969 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=816e66d4315a7aa1d741bb1ebccb5578a1f8eada;p=gnulib.git dynarray: Rename to glibc-internal/dynarray. * modules/glibc-internal/dynarray: Renamed from modules/dynarray. * modules/glibc-internal/dynarray-tests: Renamed from modules/dynarray-tests. * modules/regex (Depends-on): Update. * NEWS: Mention this change and the previous one. --- diff --git a/ChangeLog b/ChangeLog index 70e717284b..70ece5200a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2022-11-03 Bruno Haible <bruno@clisp.org> + + dynarray: Rename to glibc-internal/dynarray. + * modules/glibc-internal/dynarray: Renamed from modules/dynarray. + * modules/glibc-internal/dynarray-tests: Renamed from + modules/dynarray-tests. + * modules/regex (Depends-on): Update. + * NEWS: Mention this change and the previous one. + 2022-11-03 Bruno Haible <bruno@clisp.org> scratch_buffer: Rename to glibc-internal/scratch_buffer. diff --git a/NEWS b/NEWS index 327fc8ceee..3b83e2978d 100644 --- a/NEWS +++ b/NEWS @@ -74,6 +74,10 @@ User visible incompatible changes Date Modules Changes +2022-11-03 dynarray These modules are renamed to glibc-internal/dynarray + scratch_buffer and glibc-internal/scratch_buffer, respectively. + They are not meant for general use. + 2022-11-02 scratch_buffer The function 'gl_scratch_buffer_dupfree' is removed. 2022-09-10 stdbool This module now assumes C99 and provides C23, diff --git a/modules/dynarray b/modules/dynarray deleted file mode 100644 index 668959482e..0000000000 --- a/modules/dynarray +++ /dev/null @@ -1,63 +0,0 @@ -Description: -Type-safe arrays which grow dynamically. - -Files: -lib/dynarray.h -lib/malloc/dynarray-skeleton.c -lib/malloc/dynarray.h -lib/malloc/dynarray_at_failure.c -lib/malloc/dynarray_emplace_enlarge.c -lib/malloc/dynarray_finalize.c -lib/malloc/dynarray_resize.c -lib/malloc/dynarray_resize_clear.c - -Depends-on: -c99 -builtin-expect -gen-header -libc-config -stdbool -stddef -intprops - -configure.ac: -AC_PROG_MKDIR_P - -Makefile.am: -BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h - -malloc/dynarray.gl.h: malloc/dynarray.h - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/dynarray.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t - -malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ - -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ - -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ - -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - $(srcdir)/malloc/dynarray-skeleton.c > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t - -lib_SOURCES += malloc/dynarray_at_failure.c \ - malloc/dynarray_emplace_enlarge.c \ - malloc/dynarray_finalize.c \ - malloc/dynarray_resize.c \ - malloc/dynarray_resize_clear.c - -Include: -"dynarray.h" - -License: -LGPLv2+ - -Maintainer: -all, glibc diff --git a/modules/dynarray-tests b/modules/dynarray-tests deleted file mode 100644 index 2791b9c603..0000000000 --- a/modules/dynarray-tests +++ /dev/null @@ -1,11 +0,0 @@ -Files: -tests/test-dynarray.c -tests/macros.h - -Depends-on: - -configure.ac: - -Makefile.am: -TESTS += test-dynarray -check_PROGRAMS += test-dynarray diff --git a/modules/glibc-internal/dynarray b/modules/glibc-internal/dynarray new file mode 100644 index 0000000000..668959482e --- /dev/null +++ b/modules/glibc-internal/dynarray @@ -0,0 +1,63 @@ +Description: +Type-safe arrays which grow dynamically. + +Files: +lib/dynarray.h +lib/malloc/dynarray-skeleton.c +lib/malloc/dynarray.h +lib/malloc/dynarray_at_failure.c +lib/malloc/dynarray_emplace_enlarge.c +lib/malloc/dynarray_finalize.c +lib/malloc/dynarray_resize.c +lib/malloc/dynarray_resize_clear.c + +Depends-on: +c99 +builtin-expect +gen-header +libc-config +stdbool +stddef +intprops + +configure.ac: +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h + +malloc/dynarray.gl.h: malloc/dynarray.h + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/dynarray.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t + +malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \ + -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ + -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ + -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + $(srcdir)/malloc/dynarray-skeleton.c > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t + +lib_SOURCES += malloc/dynarray_at_failure.c \ + malloc/dynarray_emplace_enlarge.c \ + malloc/dynarray_finalize.c \ + malloc/dynarray_resize.c \ + malloc/dynarray_resize_clear.c + +Include: +"dynarray.h" + +License: +LGPLv2+ + +Maintainer: +all, glibc diff --git a/modules/glibc-internal/dynarray-tests b/modules/glibc-internal/dynarray-tests new file mode 100644 index 0000000000..2791b9c603 --- /dev/null +++ b/modules/glibc-internal/dynarray-tests @@ -0,0 +1,11 @@ +Files: +tests/test-dynarray.c +tests/macros.h + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-dynarray +check_PROGRAMS += test-dynarray diff --git a/modules/regex b/modules/regex index b780427221..7779a1e796 100644 --- a/modules/regex +++ b/modules/regex @@ -20,27 +20,27 @@ c99 extensions ssize_t vararrays -attribute [test $ac_use_included_regex = yes] -btowc [test $ac_use_included_regex = yes] -builtin-expect [test $ac_use_included_regex = yes] -dynarray [test $ac_use_included_regex = yes] -intprops [test $ac_use_included_regex = yes] -iswctype [test $ac_use_included_regex = yes] -langinfo [test $ac_use_included_regex = yes] -libc-config [test $ac_use_included_regex = yes] -lock [test $ac_use_included_regex = yes] -memcmp [test $ac_use_included_regex = yes] -memmove [test $ac_use_included_regex = yes] -mbrtowc [test $ac_use_included_regex = yes] -mbsinit [test $ac_use_included_regex = yes] -nl_langinfo [test $ac_use_included_regex = yes] -stdbool [test $ac_use_included_regex = yes] -stdint [test $ac_use_included_regex = yes] -verify [test $ac_use_included_regex = yes] -wchar [test $ac_use_included_regex = yes] -wcrtomb [test $ac_use_included_regex = yes] -wctype-h [test $ac_use_included_regex = yes] -wctype [test $ac_use_included_regex = yes] +attribute [test $ac_use_included_regex = yes] +btowc [test $ac_use_included_regex = yes] +builtin-expect [test $ac_use_included_regex = yes] +glibc-internal/dynarray [test $ac_use_included_regex = yes] +intprops [test $ac_use_included_regex = yes] +iswctype [test $ac_use_included_regex = yes] +langinfo [test $ac_use_included_regex = yes] +libc-config [test $ac_use_included_regex = yes] +lock [test $ac_use_included_regex = yes] +memcmp [test $ac_use_included_regex = yes] +memmove [test $ac_use_included_regex = yes] +mbrtowc [test $ac_use_included_regex = yes] +mbsinit [test $ac_use_included_regex = yes] +nl_langinfo [test $ac_use_included_regex = yes] +stdbool [test $ac_use_included_regex = yes] +stdint [test $ac_use_included_regex = yes] +verify [test $ac_use_included_regex = yes] +wchar [test $ac_use_included_regex = yes] +wcrtomb [test $ac_use_included_regex = yes] +wctype-h [test $ac_use_included_regex = yes] +wctype [test $ac_use_included_regex = yes] configure.ac: gl_REGEX