diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2023-09-26 11:45:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 11:45:04 +0200 |
| commit | b6bc9d72f65a5086f310f321e969d96e9a559e75 (patch) | |
| tree | 1e9a9f8c36c9dfc0106507f7b7a0055af83c4a07 /libc/src/spawn | |
| parent | 7675f541f75baa20e8ec007cd625a837e89fc01f (diff) | |
[libc] Mass replace enclosing namespace (#67032)
This is step 4 of
https://discourse.llvm.org/t/rfc-customizable-namespace-to-allow-testing-the-libc-when-the-system-libc-is-also-llvms-libc/73079
Diffstat (limited to 'libc/src/spawn')
| -rw-r--r-- | libc/src/spawn/file_actions.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/linux/posix_spawn.cpp | 26 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_addclose.cpp | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_addclose.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_adddup2.cpp | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_adddup2.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_addopen.cpp | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_addopen.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_destroy.cpp | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_destroy.h | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_init.cpp | 4 | ||||
| -rw-r--r-- | libc/src/spawn/posix_spawn_file_actions_init.h | 4 |
13 files changed, 37 insertions, 37 deletions
diff --git a/libc/src/spawn/file_actions.h b/libc/src/spawn/file_actions.h index ee509a1e0ad9..7113256bf49c 100644 --- a/libc/src/spawn/file_actions.h +++ b/libc/src/spawn/file_actions.h @@ -12,7 +12,7 @@ #include <spawn.h> // For mode_t #include <stdint.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { struct BaseSpawnFileAction { enum ActionType { @@ -67,6 +67,6 @@ struct SpawnFileDup2Action : public BaseSpawnFileAction { newfd(new_fdesc) {} }; -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_FILE_ACTIONS_H diff --git a/libc/src/spawn/linux/posix_spawn.cpp b/libc/src/spawn/linux/posix_spawn.cpp index 44c79f9400a8..0a0467df4959 100644 --- a/libc/src/spawn/linux/posix_spawn.cpp +++ b/libc/src/spawn/linux/posix_spawn.cpp @@ -18,7 +18,7 @@ #include <spawn.h> #include <sys/syscall.h> // For syscall numbers. -namespace __llvm_libc { +namespace LIBC_NAMESPACE { namespace { @@ -27,9 +27,9 @@ pid_t fork() { // to avoid duplicating the complete stack from the parent. A new stack will // be created on exec anyway so duplicating the full stack is unnecessary. #ifdef SYS_fork - return __llvm_libc::syscall_impl<pid_t>(SYS_fork); + return LIBC_NAMESPACE::syscall_impl<pid_t>(SYS_fork); #elif defined(SYS_clone) - return __llvm_libc::syscall_impl<pid_t>(SYS_clone, SIGCHLD, 0); + return LIBC_NAMESPACE::syscall_impl<pid_t>(SYS_clone, SIGCHLD, 0); #else #error "fork or clone syscalls not available." #endif @@ -37,10 +37,10 @@ pid_t fork() { cpp::optional<int> open(const char *path, int oflags, mode_t mode) { #ifdef SYS_open - int fd = __llvm_libc::syscall_impl<int>(SYS_open, path, oflags, mode); + int fd = LIBC_NAMESPACE::syscall_impl<int>(SYS_open, path, oflags, mode); #else - int fd = - __llvm_libc::syscall_impl<int>(SYS_openat, AT_FDCWD, path, oflags, mode); + int fd = LIBC_NAMESPACE::syscall_impl<int>(SYS_openat, AT_FDCWD, path, oflags, + mode); #endif if (fd > 0) return fd; @@ -50,14 +50,14 @@ cpp::optional<int> open(const char *path, int oflags, mode_t mode) { return cpp::nullopt; } -void close(int fd) { __llvm_libc::syscall_impl<long>(SYS_close, fd); } +void close(int fd) { LIBC_NAMESPACE::syscall_impl<long>(SYS_close, fd); } // We use dup3 if dup2 is not available, similar to our implementation of dup2 bool dup2(int fd, int newfd) { #ifdef SYS_dup2 - int ret = __llvm_libc::syscall_impl<int>(SYS_dup2, fd, newfd); + int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_dup2, fd, newfd); #elif defined(SYS_dup3) - int ret = __llvm_libc::syscall_impl<int>(SYS_dup3, fd, newfd, 0); + int ret = LIBC_NAMESPACE::syscall_impl<int>(SYS_dup3, fd, newfd, 0); #else #error "dup2 and dup3 syscalls not available." #endif @@ -68,8 +68,8 @@ bool dup2(int fd, int newfd) { // exit implementation which exits with code 127. void exit() { for (;;) { - __llvm_libc::syscall_impl<long>(SYS_exit_group, 127); - __llvm_libc::syscall_impl<long>(SYS_exit, 127); + LIBC_NAMESPACE::syscall_impl<long>(SYS_exit_group, 127); + LIBC_NAMESPACE::syscall_impl<long>(SYS_exit, 127); } } @@ -117,7 +117,7 @@ void child_process(const char *__restrict path, } } - if (__llvm_libc::syscall_impl<long>(SYS_execve, path, argv, envp) < 0) + if (LIBC_NAMESPACE::syscall_impl<long>(SYS_execve, path, argv, envp) < 0) exit(); } @@ -145,4 +145,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn.h b/libc/src/spawn/posix_spawn.h index 721462701b25..354b94c2d2d7 100644 --- a/libc/src/spawn/posix_spawn.h +++ b/libc/src/spawn/posix_spawn.h @@ -11,13 +11,13 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn(pid_t *__restrict pid, const char *__restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t *__restrict attr, char *const *__restrict argv, char *const *__restrict envp); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_H diff --git a/libc/src/spawn/posix_spawn_file_actions_addclose.cpp b/libc/src/spawn/posix_spawn_file_actions_addclose.cpp index 492c3e0b8bc1..9b3c4885dfd7 100644 --- a/libc/src/spawn/posix_spawn_file_actions_addclose.cpp +++ b/libc/src/spawn/posix_spawn_file_actions_addclose.cpp @@ -15,7 +15,7 @@ #include <errno.h> #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addclose, (posix_spawn_file_actions_t *__restrict actions, int fd)) { @@ -33,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addclose, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn_file_actions_addclose.h b/libc/src/spawn/posix_spawn_file_actions_addclose.h index 5eda292760da..c84965180fa7 100644 --- a/libc/src/spawn/posix_spawn_file_actions_addclose.h +++ b/libc/src/spawn/posix_spawn_file_actions_addclose.h @@ -11,11 +11,11 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn_file_actions_addclose( posix_spawn_file_actions_t *__restrict actions, int fd); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE_H diff --git a/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp b/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp index ca18629ba683..caa558e2a9a5 100644 --- a/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp +++ b/libc/src/spawn/posix_spawn_file_actions_adddup2.cpp @@ -15,7 +15,7 @@ #include <errno.h> #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_adddup2, (posix_spawn_file_actions_t * actions, int fd, int newfd)) { @@ -33,4 +33,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_adddup2, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn_file_actions_adddup2.h b/libc/src/spawn/posix_spawn_file_actions_adddup2.h index 33444184f973..7a7f3a5fb5bf 100644 --- a/libc/src/spawn/posix_spawn_file_actions_adddup2.h +++ b/libc/src/spawn/posix_spawn_file_actions_adddup2.h @@ -11,11 +11,11 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *actions, int fd, int newfd); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2_H diff --git a/libc/src/spawn/posix_spawn_file_actions_addopen.cpp b/libc/src/spawn/posix_spawn_file_actions_addopen.cpp index 3b12c8bbc17c..c544f04bd54a 100644 --- a/libc/src/spawn/posix_spawn_file_actions_addopen.cpp +++ b/libc/src/spawn/posix_spawn_file_actions_addopen.cpp @@ -15,7 +15,7 @@ #include <errno.h> #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addopen, (posix_spawn_file_actions_t *__restrict actions, int fd, @@ -34,4 +34,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_addopen, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn_file_actions_addopen.h b/libc/src/spawn/posix_spawn_file_actions_addopen.h index ff757d42e514..121213abe50f 100644 --- a/libc/src/spawn/posix_spawn_file_actions_addopen.h +++ b/libc/src/spawn/posix_spawn_file_actions_addopen.h @@ -11,12 +11,12 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn_file_actions_addopen( posix_spawn_file_actions_t *__restrict actions, int fd, const char *__restrict path, int oflag, mode_t mode); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN_H diff --git a/libc/src/spawn/posix_spawn_file_actions_destroy.cpp b/libc/src/spawn/posix_spawn_file_actions_destroy.cpp index 7be531c67322..73e0ac828cd6 100644 --- a/libc/src/spawn/posix_spawn_file_actions_destroy.cpp +++ b/libc/src/spawn/posix_spawn_file_actions_destroy.cpp @@ -15,7 +15,7 @@ #include <errno.h> #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_destroy, (posix_spawn_file_actions_t * actions)) { @@ -49,4 +49,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_destroy, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn_file_actions_destroy.h b/libc/src/spawn/posix_spawn_file_actions_destroy.h index 89f3c55dd99b..28b9b05b9e79 100644 --- a/libc/src/spawn/posix_spawn_file_actions_destroy.h +++ b/libc/src/spawn/posix_spawn_file_actions_destroy.h @@ -11,10 +11,10 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *actions); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_DESTROY_H diff --git a/libc/src/spawn/posix_spawn_file_actions_init.cpp b/libc/src/spawn/posix_spawn_file_actions_init.cpp index 99502ff44962..04e5610c717c 100644 --- a/libc/src/spawn/posix_spawn_file_actions_init.cpp +++ b/libc/src/spawn/posix_spawn_file_actions_init.cpp @@ -12,7 +12,7 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_init, (posix_spawn_file_actions_t * actions)) { @@ -21,4 +21,4 @@ LLVM_LIBC_FUNCTION(int, posix_spawn_file_actions_init, return 0; } -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE diff --git a/libc/src/spawn/posix_spawn_file_actions_init.h b/libc/src/spawn/posix_spawn_file_actions_init.h index da354e1b0eba..d7b228fff08d 100644 --- a/libc/src/spawn/posix_spawn_file_actions_init.h +++ b/libc/src/spawn/posix_spawn_file_actions_init.h @@ -11,10 +11,10 @@ #include <spawn.h> -namespace __llvm_libc { +namespace LIBC_NAMESPACE { int posix_spawn_file_actions_init(posix_spawn_file_actions_t *actions); -} // namespace __llvm_libc +} // namespace LIBC_NAMESPACE #endif // LLVM_LIBC_SRC_SPAWN_POSIX_SPAWN_FILE_ACTIONS_INIT_H |
