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 a7a3f30c0d331d9fc944e6162a45d2603451db89..70e717284b95e24d83d924f39c4259da4d647650 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-11-03  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        scratch_buffer: Document last change.

diff --git a/modules/canonicalize b/modules/canonicalize
index ddd83bc8417815d8c8f43d6e8ddeffb7aa574538..25667c431bd19334c540a90b5c13d526ec3b6092 100644 (file)
--- 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 252618e95e08a89473424a9a34fbe401a0df4717..7842cda2da0d9ce7b0d115d87bd4ffd8b87658c2 100644 (file)
--- 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 83cd729ceb6d107dd8e8ff1ab4c24f8baf223dec..4a89521e01b38d0af6bbb2f23e5850c53288ab09 100644 (file)
--- 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