summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-06 22:56:22 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-06 22:56:22 +0000
commit3340156670d78e1dcfd8e3103401cfc689ea172e (patch)
tree2c078a18f85e33c717e2956d894a3179fa352225 /bin
parent7dfda9f18312e783397713e7a955ce8066dbcd3c (diff)
standalone ; at top scope is illegal in ansi c
Diffstat (limited to 'bin')
-rw-r--r--bin/systrace/alias.c10
-rw-r--r--bin/systrace/intercept.c12
-rw-r--r--bin/systrace/policy.c14
3 files changed, 18 insertions, 18 deletions
diff --git a/bin/systrace/alias.c b/bin/systrace/alias.c
index 2b48ee0138e..d319c5de380 100644
--- a/bin/systrace/alias.c
+++ b/bin/systrace/alias.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alias.c,v 1.4 2002/07/30 05:55:08 itojun Exp $ */
+/* $OpenBSD: alias.c,v 1.5 2002/09/06 22:56:21 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -74,11 +74,11 @@ revcompare(struct systrace_revalias *a, struct systrace_revalias *b)
return (strcmp(a->name, b->name));
}
-SPLAY_PROTOTYPE(alitr, systrace_alias, node, aliascompare);
-SPLAY_GENERATE(alitr, systrace_alias, node, aliascompare);
+SPLAY_PROTOTYPE(alitr, systrace_alias, node, aliascompare)
+SPLAY_GENERATE(alitr, systrace_alias, node, aliascompare)
-SPLAY_PROTOTYPE(revtr, systrace_revalias, node, revcompare);
-SPLAY_GENERATE(revtr, systrace_revalias, node, revcompare);
+SPLAY_PROTOTYPE(revtr, systrace_revalias, node, revcompare)
+SPLAY_GENERATE(revtr, systrace_revalias, node, revcompare)
int
systrace_initalias(void)
diff --git a/bin/systrace/intercept.c b/bin/systrace/intercept.c
index 76c5c35d8e3..59376ac12f2 100644
--- a/bin/systrace/intercept.c
+++ b/bin/systrace/intercept.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intercept.c,v 1.29 2002/08/28 03:30:27 itojun Exp $ */
+/* $OpenBSD: intercept.c,v 1.30 2002/09/06 22:56:21 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -102,11 +102,11 @@ pidcompare(struct intercept_pid *a, struct intercept_pid *b)
return (-1);
}
-SPLAY_PROTOTYPE(sctree, intercept_syscall, node, sccompare);
-SPLAY_GENERATE(sctree, intercept_syscall, node, sccompare);
+SPLAY_PROTOTYPE(sctree, intercept_syscall, node, sccompare)
+SPLAY_GENERATE(sctree, intercept_syscall, node, sccompare)
-SPLAY_PROTOTYPE(pidtree, intercept_pid, next, pidcompare);
-SPLAY_GENERATE(pidtree, intercept_pid, next, pidcompare);
+SPLAY_PROTOTYPE(pidtree, intercept_pid, next, pidcompare)
+SPLAY_GENERATE(pidtree, intercept_pid, next, pidcompare)
extern struct intercept_system intercept;
int ic_abort;
@@ -493,7 +493,7 @@ intercept_get_string(int fd, pid_t pid, void *addr)
stride = 32;
do {
if (intercept.io(fd, pid, INTERCEPT_READ, (char *)addr + off,
- &name[off], stride) == -1) {
+ &name[off], stride) == -1) {
/* Did the current system call get interrupted? */
if (errno == EBUSY)
return (NULL);
diff --git a/bin/systrace/policy.c b/bin/systrace/policy.c
index 17311f4cdd9..fbbb1e9e98c 100644
--- a/bin/systrace/policy.c
+++ b/bin/systrace/policy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: policy.c,v 1.16 2002/08/30 17:09:21 itojun Exp $ */
+/* $OpenBSD: policy.c,v 1.17 2002/09/06 22:56:21 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@@ -63,8 +63,8 @@ psccompare(struct policy_syscall *a, struct policy_syscall *b)
return (strcmp(a->name, b->name));
}
-SPLAY_PROTOTYPE(syscalltree, policy_syscall, node, psccompare);
-SPLAY_GENERATE(syscalltree, policy_syscall, node, psccompare);
+SPLAY_PROTOTYPE(syscalltree, policy_syscall, node, psccompare)
+SPLAY_GENERATE(syscalltree, policy_syscall, node, psccompare)
static SPLAY_HEAD(policytree, policy) policyroot;
static SPLAY_HEAD(polnrtree, policy) polnrroot;
@@ -87,11 +87,11 @@ polnrcompare(struct policy *a, struct policy *b)
return (-1);
}
-SPLAY_PROTOTYPE(policytree, policy, node, policycompare);
-SPLAY_GENERATE(policytree, policy, node, policycompare);
+SPLAY_PROTOTYPE(policytree, policy, node, policycompare)
+SPLAY_GENERATE(policytree, policy, node, policycompare)
-SPLAY_PROTOTYPE(polnrtree, policy, nrnode, polnrcompare);
-SPLAY_GENERATE(polnrtree, policy, nrnode, polnrcompare);
+SPLAY_PROTOTYPE(polnrtree, policy, nrnode, polnrcompare)
+SPLAY_GENERATE(polnrtree, policy, nrnode, polnrcompare)
extern int userpolicy;