summaryrefslogtreecommitdiffstats
path: root/usr.bin/xargs
diff options
context:
space:
mode:
authormckay <mckay@FreeBSD.org>2010-11-21 21:31:29 +0000
committermckay <mckay@FreeBSD.org>2010-11-21 21:31:29 +0000
commitef35e5a176dd37c34a8da9292301a56bc04ebe7e (patch)
tree90b0985c3710dc4e56b3c62743120d3a949cc652 /usr.bin/xargs
parent076c86b1ea64c90978af8d15f2bfd8611098619f (diff)
downloadFreeBSD-src-ef35e5a176dd37c34a8da9292301a56bc04ebe7e.zip
FreeBSD-src-ef35e5a176dd37c34a8da9292301a56bc04ebe7e.tar.gz
Various syntactic tweaks to satisfy style(9). No change to execution.
Submitted by: gcooper@
Diffstat (limited to 'usr.bin/xargs')
-rw-r--r--usr.bin/xargs/xargs.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 350a534..aa8f07b 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -586,14 +586,14 @@ xwait(int block, int *status) {
if (pids_empty()) {
errno = ECHILD;
- return -1;
+ return (-1);
}
while ((pid = waitpid(-1, status, block ? 0 : WNOHANG)) > 0)
if (pids_remove(pid))
break;
- return pid;
+ return (pid);
}
static void
@@ -625,27 +625,27 @@ waitchildren(const char *name, int waitall)
#define NOPID (0)
static void
-pids_init()
+pids_init(void)
{
int i;
if ((childpids = malloc(maxprocs * sizeof(*childpids))) == NULL)
- errx(1, "malloc failed");
+ errx(1, "malloc failed");
for (i = 0; i < maxprocs; i++)
clearslot(i);
}
static int
-pids_empty()
+pids_empty(void)
{
- return curprocs == 0;
+ return (curprocs == 0);
}
static int
-pids_full()
+pids_full(void)
{
- return curprocs >= maxprocs;
+ return (curprocs >= maxprocs);
}
static void
@@ -664,22 +664,22 @@ pids_remove(pid_t pid)
int slot;
if ((slot = findslot(pid)) < 0)
- return 0;
+ return (0);
clearslot(slot);
curprocs--;
- return 1;
+ return (1);
}
static int
-findfreeslot()
+findfreeslot(void)
{
int slot;
if ((slot = findslot(NOPID)) < 0)
errx(1, "internal error: no free pid slot");
- return slot;
+ return (slot);
}
static int
@@ -689,9 +689,9 @@ findslot(pid_t pid)
for (slot = 0; slot < maxprocs; slot++)
if (childpids[slot] == pid)
- return slot;
+ return (slot);
- return -1;
+ return (-1);
}
static void
OpenPOWER on IntegriCloud