diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-22 08:28:53 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-22 08:28:53 +0000 |
| commit | 3d7207f9c56808ce623c8cd6ba003ec3e7a0a556 (patch) | |
| tree | c66fc8a2104038d8af6fb77fa1bd4cc51ff43d8e | |
| parent | Merge branch 'osc8' (diff) | |
| parent | errno: don’t use ‘_errno’ as a variable name; _ are reserved for use as identifiers (diff) | |
Merge branch 'rename-_errno'
| -rw-r--r-- | config.c | 6 | ||||
| -rw-r--r-- | log.c | 6 | ||||
| -rw-r--r-- | slave.c | 22 | ||||
| -rw-r--r-- | spawn.c | 23 |
4 files changed, 29 insertions, 28 deletions
@@ -149,13 +149,13 @@ static_assert(ALEN(url_binding_action_map) == BIND_ACTION_URL_COUNT, #define LOG_AND_NOTIFY_ERRNO(...) \ do { \ - int _errno = errno; \ + int errno_copy = errno; \ LOG_ERRNO(__VA_ARGS__); \ int len = snprintf(NULL, 0, __VA_ARGS__); \ - int errno_len = snprintf(NULL, 0, ": %s", strerror(_errno)); \ + int errno_len = snprintf(NULL, 0, ": %s", strerror(errno_copy)); \ char *text = xmalloc(len + errno_len + 1); \ snprintf(text, len + errno_len + 1, __VA_ARGS__); \ - snprintf(&text[len], errno_len + 1, ": %s", strerror(_errno)); \ + snprintf(&text[len], errno_len + 1, ": %s", strerror(errno_copy)); \ struct user_notification notif = { \ .kind = USER_NOTIFICATION_ERROR, \ .text = text, \ @@ -149,14 +149,14 @@ void log_errno(enum log_class log_class, const char *module, } void log_errno_provided(enum log_class log_class, const char *module, - const char *file, int lineno, int _errno, + const char *file, int lineno, int errno_copy, const char *fmt, ...) { va_list ap1, ap2; va_start(ap1, fmt); va_copy(ap2, ap1); - _log(log_class, module, file, lineno, fmt, _errno, ap1); - _sys_log(log_class, module, file, lineno, fmt, _errno, ap2); + _log(log_class, module, file, lineno, fmt, errno_copy, ap1); + _sys_log(log_class, module, file, lineno, fmt, errno_copy, ap2); va_end(ap1); va_end(ap2); } @@ -268,20 +268,20 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, close(fork_pipe[0]); /* Close read end */ if (chdir(cwd) < 0) { - const int _errno = errno; + const int errno_copy = errno; LOG_ERRNO("failed to change working directory"); - (void)!write(fork_pipe[1], &_errno, sizeof(_errno)); - _exit(_errno); + (void)!write(fork_pipe[1], &errno_copy, sizeof(errno_copy)); + _exit(errno_copy); } /* Restore signal mask */ sigset_t mask; sigemptyset(&mask); if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0) { - const int _errno = errno; + const int errno_copy = errno; LOG_ERRNO_P(errno, "failed to restore signals"); - (void)!write(fork_pipe[1], &_errno, sizeof(_errno)); - _exit(_errno); + (void)!write(fork_pipe[1], &errno_copy, sizeof(errno_copy)); + _exit(errno_copy); } setenv("TERM", term_env, 1); @@ -319,18 +319,18 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv, close(fork_pipe[1]); /* Close write end */ LOG_DBG("slave has PID %d", pid); - int _errno; - static_assert(sizeof(errno) == sizeof(_errno), "errno size mismatch"); + int errno_copy; + static_assert(sizeof(errno) == sizeof(errno_copy), "errno size mismatch"); - ssize_t ret = read(fork_pipe[0], &_errno, sizeof(_errno)); + ssize_t ret = read(fork_pipe[0], &errno_copy, sizeof(errno_copy)); close(fork_pipe[0]); if (ret < 0) { LOG_ERRNO("failed to read from pipe"); return -1; - } else if (ret == sizeof(_errno)) { + } else if (ret == sizeof(errno_copy)) { LOG_ERRNO_P( - _errno, "%s: failed to execute", + errno_copy, "%s: failed to execute", argc == 0 ? conf_shell : argv[0]); return -1; } else @@ -39,10 +39,10 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[], sigset_t mask; sigemptyset(&mask); if (sigprocmask(SIG_SETMASK, &mask, NULL) < 0) { - const int _errno = errno; - LOG_ERRNO_P(errno, "failed to restore signals"); - (void)!write(pipe_fds[1], &_errno, sizeof(_errno)); - _exit(_errno); + const int errno_copy = errno; + LOG_ERRNO("failed to restore signals"); + (void)!write(pipe_fds[1], &errno_copy, sizeof(errno_copy)); + _exit(errno_copy); } if ((stdin_fd >= 0 && (dup2(stdin_fd, STDIN_FILENO) < 0 || close(stdin_fd) < 0)) || @@ -51,8 +51,9 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[], (cwd != NULL && chdir(cwd) < 0) || execvp(argv[0], argv) < 0) { - (void)!write(pipe_fds[1], &errno, sizeof(errno)); - _exit(errno); + const int errno_copy = errno; + (void)!write(pipe_fds[1], &errno_copy, sizeof(errno_copy)); + _exit(errno_copy); } xassert(false); _exit(errno); @@ -61,10 +62,10 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[], /* Parent */ close(pipe_fds[1]); - int _errno; - static_assert(sizeof(_errno) == sizeof(errno), "errno size mismatch"); + int errno_copy; + static_assert(sizeof(errno_copy) == sizeof(errno), "errno size mismatch"); - ssize_t ret = read(pipe_fds[0], &_errno, sizeof(_errno)); + ssize_t ret = read(pipe_fds[0], &errno_copy, sizeof(errno_copy)); close(pipe_fds[0]); if (ret == 0) { @@ -74,8 +75,8 @@ spawn(struct reaper *reaper, const char *cwd, char *const argv[], LOG_ERRNO("failed to read from pipe"); return false; } else { - LOG_ERRNO_P(_errno, "%s: failed to spawn", argv[0]); - errno = _errno; + LOG_ERRNO_P(errno_copy, "%s: failed to spawn", argv[0]); + errno = errno_copy; waitpid(pid, NULL, 0); return false; } |
