From: Alejandro Colomar Date: Tue, 3 May 2022 20:29:53 +0000 (+0200) Subject: Various pages: EXAMPLES: Separate declarations from code X-Git-Tag: man-pages-5.19-rc1~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=041a155c49100a6f458f797982ff18e25f1dc01c;p=thirdparty%2Fman-pages.git Various pages: EXAMPLES: Separate declarations from code Reported-by: checkpatch(1) Signed-off-by: Alejandro Colomar --- diff --git a/man2/clock_getres.2 b/man2/clock_getres.2 index 90443c6c12..6d99507ec3 100644 --- a/man2/clock_getres.2 +++ b/man2/clock_getres.2 @@ -458,7 +458,8 @@ CLOCK_BOOTTIME : 72691.019 (20h 11m 31s) static void displayClock(clockid_t clock, const char *name, bool showRes) { - struct timespec ts; + long days; + struct timespec ts; if (clock_gettime(clock, &ts) == \-1) { perror("clock_gettime"); @@ -468,7 +469,7 @@ displayClock(clockid_t clock, const char *name, bool showRes) printf("%\-15s: %10jd.%03ld (", name, (intmax_t) ts.tv_sec, ts.tv_nsec / 1000000); - long days = ts.tv_sec / SECS_IN_DAY; + days = ts.tv_sec / SECS_IN_DAY; if (days > 0) printf("%ld days + ", days); diff --git a/man2/close_range.2 b/man2/close_range.2 index bfc1aaabac..836d963577 100644 --- a/man2/close_range.2 +++ b/man2/close_range.2 @@ -214,23 +214,27 @@ result from the calls to static void show_fds(void) { - DIR *dirp = opendir("/proc/self/fd"); + DIR *dirp; + char path[PATH_MAX], target[PATH_MAX]; + ssize_t len; + struct dirent *dp; + + dirp = opendir("/proc/self/fd"); if (dirp == NULL) { perror("opendir"); exit(EXIT_FAILURE); } for (;;) { - struct dirent *dp = readdir(dirp); + dp = readdir(dirp); if (dp == NULL) break; if (dp\->d_type == DT_LNK) { - char path[PATH_MAX], target[PATH_MAX]; snprintf(path, sizeof(path), "/proc/self/fd/%s", dp\->d_name); - ssize_t len = readlink(path, target, sizeof(target)); + len = readlink(path, target, sizeof(target)); printf("%s ==> %.*s\en", path, (int) len, target); } } @@ -241,8 +245,10 @@ show_fds(void) int main(int argc, char *argv[]) { + int fd; + for (int j = 1; j < argc; j++) { - int fd = open(argv[j], O_RDONLY); + fd = open(argv[j], O_RDONLY); if (fd == \-1) { perror(argv[j]); exit(EXIT_FAILURE); diff --git a/man2/futex.2 b/man2/futex.2 index 5a68519563..e48a0b5c91 100644 --- a/man2/futex.2 +++ b/man2/futex.2 @@ -1836,7 +1836,8 @@ futex(uint32_t *uaddr, int futex_op, uint32_t val, static void fwait(uint32_t *futexp) { - long s; + long s; + const uint32_t one = 1; /* atomic_compare_exchange_strong(ptr, oldval, newval) atomically performs the equivalent of: @@ -1849,7 +1850,6 @@ fwait(uint32_t *futexp) while (1) { /* Is the futex available? */ - const uint32_t one = 1; if (atomic_compare_exchange_strong(futexp, &one, 0)) break; /* Yes */ @@ -1868,12 +1868,12 @@ fwait(uint32_t *futexp) static void fpost(uint32_t *futexp) { - long s; + long s; + const uint32_t zero = 0; /* atomic_compare_exchange_strong() was described in comments above. */ - const uint32_t zero = 0; if (atomic_compare_exchange_strong(futexp, &zero, 1)) { s = futex(futexp, FUTEX_WAKE, 1, NULL, NULL, 0); if (s == \-1) diff --git a/man2/poll.2 b/man2/poll.2 index b9e4aaef4a..a9cfb8ff85 100644 --- a/man2/poll.2 +++ b/man2/poll.2 @@ -562,8 +562,10 @@ at which point the file descriptor was closed and the program terminated. int main(int argc, char *argv[]) { - int nfds, num_open_fds; - struct pollfd *pfds; + int nfds, num_open_fds, ready; + char buf[10]; + ssize_t s; + struct pollfd *pfds; if (argc < 2) { fprintf(stderr, "Usage: %s file...\en", argv[0]); @@ -591,8 +593,6 @@ main(int argc, char *argv[]) open. */ while (num_open_fds > 0) { - int ready; - printf("About to poll()\en"); ready = poll(pfds, nfds, \-1); if (ready == \-1) @@ -603,8 +603,6 @@ main(int argc, char *argv[]) /* Deal with array returned by poll(). */ for (int j = 0; j < nfds; j++) { - char buf[10]; - if (pfds[j].revents != 0) { printf(" fd=%d; events: %s%s%s\en", pfds[j].fd, (pfds[j].revents & POLLIN) ? "POLLIN " : "", @@ -612,7 +610,7 @@ main(int argc, char *argv[]) (pfds[j].revents & POLLERR) ? "POLLERR " : ""); if (pfds[j].revents & POLLIN) { - ssize_t s = read(pfds[j].fd, buf, sizeof(buf)); + s = read(pfds[j].fd, buf, sizeof(buf)); if (s == \-1) errExit("read"); printf(" read %zd bytes: %.*s\en", diff --git a/man2/seccomp_unotify.2 b/man2/seccomp_unotify.2 index 8d7ffac925..4ae8410604 100644 --- a/man2/seccomp_unotify.2 +++ b/man2/seccomp_unotify.2 @@ -1636,7 +1636,11 @@ closeSocketPair(int sockPair[2]) static pid_t targetProcess(int sockPair[2], char *argv[]) { - pid_t targetPid = fork(); + int notifyFd, s; + pid_t targetPid; + + targetPid = fork(); + if (targetPid == \-1) errExit("fork"); @@ -1652,7 +1656,7 @@ targetProcess(int sockPair[2], char *argv[]) if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) errExit("prctl"); - int notifyFd = installNotifyFilter(); + notifyFd = installNotifyFilter(); /* Pass the notification file descriptor to the tracing process over a UNIX domain socket */ @@ -1672,7 +1676,7 @@ targetProcess(int sockPair[2], char *argv[]) for (char **ap = argv; *ap != NULL; ap++) { printf("\enT: about to mkdir(\e"%s\e")\en", *ap); - int s = mkdir(*ap, 0700); + s = mkdir(*ap, 0700); if (s == \-1) perror("T: ERROR: mkdir(2)"); else @@ -1711,11 +1715,13 @@ static bool getTargetPathname(struct seccomp_notif *req, int notifyFd, int argNum, char *path, size_t len) { - char procMemPath[PATH_MAX]; + int procMemFd; + char procMemPath[PATH_MAX]; + ssize_t nread; snprintf(procMemPath, sizeof(procMemPath), "/proc/%d/mem", req\->pid); - int procMemFd = open(procMemPath, O_RDONLY | O_CLOEXEC); + procMemFd = open(procMemPath, O_RDONLY | O_CLOEXEC); if (procMemFd == \-1) return false; @@ -1734,7 +1740,7 @@ getTargetPathname(struct seccomp_notif *req, int notifyFd, /* Read bytes at the location containing the pathname argument */ - ssize_t nread = pread(procMemFd, path, len, req\->data.args[argNum]); + nread = pread(procMemFd, path, len, req\->data.args[argNum]); close(procMemFd); @@ -1778,6 +1784,8 @@ allocSeccompNotifBuffers(struct seccomp_notif **req, struct seccomp_notif_resp **resp, struct seccomp_notif_sizes *sizes) { + size_t resp_size; + /* Discover the sizes of the structures that are used to receive notifications and send notification responses, and allocate buffers of those sizes. */ @@ -1798,7 +1806,7 @@ allocSeccompNotifBuffers(struct seccomp_notif **req, structure that are past the response size that the kernel expects, then the supervisor is not touching an invalid memory location. */ - size_t resp_size = sizes\->seccomp_notif_resp; + resp_size = sizes\->seccomp_notif_resp; if (sizeof(struct seccomp_notif_resp) > resp_size) resp_size = sizeof(struct seccomp_notif_resp); @@ -1814,10 +1822,11 @@ allocSeccompNotifBuffers(struct seccomp_notif **req, static void handleNotifications(int notifyFd) { - struct seccomp_notif_sizes sizes; - struct seccomp_notif *req; - struct seccomp_notif_resp *resp; - char path[PATH_MAX]; + bool pathOK; + char path[PATH_MAX]; + struct seccomp_notif *req; + struct seccomp_notif_resp *resp; + struct seccomp_notif_sizes sizes; allocSeccompNotifBuffers(&req, &resp, &sizes); @@ -1849,8 +1858,7 @@ handleNotifications(int notifyFd) exit(EXIT_FAILURE); } - bool pathOK = getTargetPathname(req, notifyFd, 0, path, - sizeof(path)); + pathOK = getTargetPathname(req, notifyFd, 0, path, sizeof(path)); /* Prepopulate some fields of the response */ @@ -1937,7 +1945,10 @@ handleNotifications(int notifyFd) static void supervisor(int sockPair[2]) { - int notifyFd = recvfd(sockPair[1]); + int notifyFd; + + notifyFd = recvfd(sockPair[1]); + if (notifyFd == \-1) errExit("recvfd"); @@ -1949,7 +1960,8 @@ supervisor(int sockPair[2]) int main(int argc, char *argv[]) { - int sockPair[2]; + int sockPair[2]; + struct sigaction sa; setbuf(stdout, NULL); @@ -1975,7 +1987,6 @@ main(int argc, char *argv[]) /* Catch SIGCHLD when the target terminates, so that the supervisor can also terminate. */ - struct sigaction sa; sa.sa_handler = sigchldHandler; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); diff --git a/man2/userfaultfd.2 b/man2/userfaultfd.2 index 592458279f..cc83dcf7e8 100644 --- a/man2/userfaultfd.2 +++ b/man2/userfaultfd.2 @@ -756,6 +756,8 @@ static int page_size; static void * fault_handler_thread(void *arg) { + int nready; + struct pollfd pollfd; static struct uffd_msg msg; /* Data read from userfaultfd */ static int fault_cnt = 0; /* Number of faults so far handled */ long uffd; /* userfaultfd file descriptor */ @@ -781,8 +783,6 @@ fault_handler_thread(void *arg) /* See what poll() tells us about the userfaultfd. */ - struct pollfd pollfd; - int nready; pollfd.fd = uffd; pollfd.events = POLLIN; nready = poll(&pollfd, 1, \-1);