From: Bruno Haible Date: Thu, 3 Nov 2022 12:30:04 +0000 (+0100) Subject: scratch_buffer: Rename to glibc-internal/scratch_buffer. X-Git-Tag: v1.0~1970 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=9316c7139e6f1dbbfe4e282e72bba5b84d4901af;p=gnulib.git scratch_buffer: Rename to glibc-internal/scratch_buffer. * modules/glibc-internal/scratch_buffer: Renamed from modules/scratch_buffer. * modules/glibc-internal/scratch_buffer-tests: Renamed from modules/scratch_buffer-tests. * modules/canonicalize (Depends-on): Update. * modules/canonicalize-lgpl (Depends-on): Likewise. * modules/glob (Depends-on): Likewise. --- diff --git a/ChangeLog b/ChangeLog index a7a3f30c0d..70e717284b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2022-11-03 Bruno Haible + + scratch_buffer: Rename to glibc-internal/scratch_buffer. + * modules/glibc-internal/scratch_buffer: Renamed from + modules/scratch_buffer. + * modules/glibc-internal/scratch_buffer-tests: Renamed from + modules/scratch_buffer-tests. + * modules/canonicalize (Depends-on): Update. + * modules/canonicalize-lgpl (Depends-on): Likewise. + * modules/glob (Depends-on): Likewise. + 2022-11-02 Bruno Haible scratch_buffer: Document last change. diff --git a/modules/canonicalize b/modules/canonicalize index ddd83bc841..25667c431b 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -24,7 +24,7 @@ mempcpy nocrash rawmemchr readlink -scratch_buffer +glibc-internal/scratch_buffer stat stdbool sys_stat diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl index 252618e95e..7842cda2da 100644 --- a/modules/canonicalize-lgpl +++ b/modules/canonicalize-lgpl @@ -11,24 +11,24 @@ Depends-on: extensions stdlib nocrash -double-slash-root [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -eloop-threshold [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -errno [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -fcntl-h [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -filename [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -idx [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -intprops [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -libc-config [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -memmove [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -mempcpy [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -pathmax [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -rawmemchr [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -readlink [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -scratch_buffer [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -stdbool [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -sys_stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -unistd [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +double-slash-root [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +eloop-threshold [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +errno [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +fcntl-h [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +filename [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +idx [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +intprops [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +libc-config [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +memmove [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +mempcpy [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +pathmax [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +rawmemchr [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +readlink [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +glibc-internal/scratch_buffer [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +stdbool [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +sys_stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +unistd [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] configure.ac: gl_CANONICALIZE_LGPL diff --git a/modules/glibc-internal/scratch_buffer b/modules/glibc-internal/scratch_buffer new file mode 100644 index 0000000000..ace8a34d2c --- /dev/null +++ b/modules/glibc-internal/scratch_buffer @@ -0,0 +1,50 @@ +Description: +Variable-sized buffer with on-stack default allocation. + +Files: +lib/scratch_buffer.h +lib/malloc/scratch_buffer.h +lib/malloc/scratch_buffer_grow.c +lib/malloc/scratch_buffer_grow_preserve.c +lib/malloc/scratch_buffer_set_array_size.c + +Depends-on: +c99 +builtin-expect +gen-header +libc-config +stdbool +stddef +malloc-posix +realloc-posix +free-posix + +configure.ac: +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += malloc/scratch_buffer.gl.h + +malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h + $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' + $(AM_V_at)$(SED_HEADER_STDOUT) \ + -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ + -e 's|__glibc_likely|_GL_LIKELY|g' \ + -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ + -e '/libc_hidden_proto/d' \ + $(srcdir)/malloc/scratch_buffer.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t + +lib_SOURCES += malloc/scratch_buffer_grow.c \ + malloc/scratch_buffer_grow_preserve.c \ + malloc/scratch_buffer_set_array_size.c + +Include: + + +License: +LGPLv2+ + +Maintainer: +all, glibc diff --git a/modules/glibc-internal/scratch_buffer-tests b/modules/glibc-internal/scratch_buffer-tests new file mode 100644 index 0000000000..1e52951264 --- /dev/null +++ b/modules/glibc-internal/scratch_buffer-tests @@ -0,0 +1,12 @@ +Files: +tests/test-scratch-buffer.c +tests/macros.h + +Depends-on: + +configure.ac: + +Makefile.am: +TESTS += test-scratch-buffer +check_PROGRAMS += test-scratch-buffer +test_scratch_buffer_SOURCES = test-scratch-buffer.c diff --git a/modules/glob b/modules/glob index 83cd729ceb..4a89521e01 100644 --- a/modules/glob +++ b/modules/glob @@ -13,26 +13,26 @@ Depends-on: glob-h c99 largefile -alloca [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -builtin-expect [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -closedir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -d-type [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -dirfd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -flexmember [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -fnmatch [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -fstatat [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -getlogin_r [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -libc-config [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -memchr [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -mempcpy [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -opendir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -readdir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -scratch_buffer [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -stdbool [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -stdint [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -strdup [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -unistd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -malloc-posix [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +alloca [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +builtin-expect [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +closedir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +d-type [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +dirfd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +flexmember [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +fnmatch [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +fstatat [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +getlogin_r [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +libc-config [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +memchr [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +mempcpy [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +opendir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +readdir [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +glibc-internal/scratch_buffer [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +stdbool [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +stdint [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +strdup [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +unistd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +malloc-posix [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] configure.ac: gl_GLOB diff --git a/modules/scratch_buffer b/modules/scratch_buffer deleted file mode 100644 index ace8a34d2c..0000000000 --- a/modules/scratch_buffer +++ /dev/null @@ -1,50 +0,0 @@ -Description: -Variable-sized buffer with on-stack default allocation. - -Files: -lib/scratch_buffer.h -lib/malloc/scratch_buffer.h -lib/malloc/scratch_buffer_grow.c -lib/malloc/scratch_buffer_grow_preserve.c -lib/malloc/scratch_buffer_set_array_size.c - -Depends-on: -c99 -builtin-expect -gen-header -libc-config -stdbool -stddef -malloc-posix -realloc-posix -free-posix - -configure.ac: -AC_PROG_MKDIR_P - -Makefile.am: -BUILT_SOURCES += malloc/scratch_buffer.gl.h - -malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h - $(AM_V_GEN)$(MKDIR_P) '%reldir%/malloc' - $(AM_V_at)$(SED_HEADER_STDOUT) \ - -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ - -e 's|__glibc_likely|_GL_LIKELY|g' \ - -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ - -e '/libc_hidden_proto/d' \ - $(srcdir)/malloc/scratch_buffer.h > $@-t - $(AM_V_at)mv $@-t $@ -MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t - -lib_SOURCES += malloc/scratch_buffer_grow.c \ - malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c - -Include: - - -License: -LGPLv2+ - -Maintainer: -all, glibc diff --git a/modules/scratch_buffer-tests b/modules/scratch_buffer-tests deleted file mode 100644 index 1e52951264..0000000000 --- a/modules/scratch_buffer-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-scratch-buffer.c -tests/macros.h - -Depends-on: - -configure.ac: - -Makefile.am: -TESTS += test-scratch-buffer -check_PROGRAMS += test-scratch-buffer -test_scratch_buffer_SOURCES = test-scratch-buffer.c