>From 371a0f95a7e90d29a7272d0e7cfde1eb0b61a235 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 3 Nov 2022 13:30:04 +0100 Subject: [PATCH 1/2] 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. --- ChangeLog | 11 +++++ modules/canonicalize | 2 +- modules/canonicalize-lgpl | 36 ++++++++--------- modules/{ => glibc-internal}/scratch_buffer | 0 .../{ => glibc-internal}/scratch_buffer-tests | 0 modules/glob | 40 +++++++++---------- 6 files changed, 50 insertions(+), 39 deletions(-) rename modules/{ => glibc-internal}/scratch_buffer (100%) rename modules/{ => glibc-internal}/scratch_buffer-tests (100%) 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/scratch_buffer b/modules/glibc-internal/scratch_buffer similarity index 100% rename from modules/scratch_buffer rename to modules/glibc-internal/scratch_buffer diff --git a/modules/scratch_buffer-tests b/modules/glibc-internal/scratch_buffer-tests similarity index 100% rename from modules/scratch_buffer-tests rename to modules/glibc-internal/scratch_buffer-tests 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 -- 2.34.1