Module Name: src
Committed By: rillig
Date: Sat Jan 9 16:06:09 UTC 2021
Modified Files:
src/usr.bin/make: arch.c cond.c enum.c for.c job.c main.c meta.c suff.c
var.c
src/usr.bin/make/filemon: filemon_ktrace.c
Log Message:
make(1): fix lint warnings
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/usr.bin/make/arch.c
cvs rdiff -u -r1.233 -r1.234 src/usr.bin/make/cond.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/enum.c
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/make/for.c
cvs rdiff -u -r1.394 -r1.395 src/usr.bin/make/job.c
cvs rdiff -u -r1.509 -r1.510 src/usr.bin/make/main.c
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/make/meta.c
cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/suff.c
cvs rdiff -u -r1.778 -r1.779 src/usr.bin/make/var.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/filemon/filemon_ktrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.192 src/usr.bin/make/arch.c:1.193
--- src/usr.bin/make/arch.c:1.192 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/arch.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.192 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
#include "config.h"
/* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: arch.c,v 1.192 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -871,6 +871,7 @@ Arch_Touch(GNode *gn)
* Both the modification time of the library and of the RANLIBMAG member are
* set to 'now'.
*/
+/*ARGSUSED*/
void
Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.233 src/usr.bin/make/cond.c:1.234
--- src/usr.bin/make/cond.c:1.233 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/cond.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.233 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.234 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.233 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.234 2021/01/09 16:06:09 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -286,6 +286,7 @@ ParseFuncArg(const char **pp, Boolean do
}
/* Test whether the given variable is defined. */
+/*ARGSUSED*/
static Boolean
FuncDefined(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
@@ -296,6 +297,7 @@ FuncDefined(size_t argLen MAKE_ATTR_UNUS
}
/* See if the given target is being made. */
+/*ARGSUSED*/
static Boolean
FuncMake(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
@@ -308,6 +310,7 @@ FuncMake(size_t argLen MAKE_ATTR_UNUSED,
}
/* See if the given file exists. */
+/*ARGSUSED*/
static Boolean
FuncExists(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
@@ -323,6 +326,7 @@ FuncExists(size_t argLen MAKE_ATTR_UNUSE
}
/* See if the given node exists and is an actual target. */
+/*ARGSUSED*/
static Boolean
FuncTarget(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
@@ -334,6 +338,7 @@ FuncTarget(size_t argLen MAKE_ATTR_UNUSE
* See if the given node exists and is an actual target with commands
* associated with it.
*/
+/*ARGSUSED*/
static Boolean
FuncCommands(size_t argLen MAKE_ATTR_UNUSED, const char *arg)
{
@@ -697,6 +702,7 @@ done_lhs:
* The argument to empty() is a variable name, optionally followed by
* variable modifiers.
*/
+/*ARGSUSED*/
static size_t
ParseEmptyArg(const char **pp, Boolean doEval,
const char *func MAKE_ATTR_UNUSED, char **out_arg)
@@ -733,6 +739,7 @@ ParseEmptyArg(const char **pp, Boolean d
return magic_res;
}
+/*ARGSUSED*/
static Boolean
FuncEmpty(size_t arglen, const char *arg MAKE_ATTR_UNUSED)
{
Index: src/usr.bin/make/enum.c
diff -u src/usr.bin/make/enum.c:1.13 src/usr.bin/make/enum.c:1.14
--- src/usr.bin/make/enum.c:1.13 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/enum.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: enum.c,v 1.13 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $ */
/*
Copyright (c) 2020 Roland Illig <[email protected]>
@@ -29,7 +29,7 @@
#include "make.h"
-MAKE_RCSID("$NetBSD: enum.c,v 1.13 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $");
/*
* Convert a bitset into a string representation, showing the names of the
@@ -88,4 +88,5 @@ Enum_ValueToString(int value, const Enum
return spec->es_name;
}
abort(/* unknown enum value */);
+ /*NOTREACHED*/
}
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.132 src/usr.bin/make/for.c:1.133
--- src/usr.bin/make/for.c:1.132 Thu Dec 31 14:10:04 2020
+++ src/usr.bin/make/for.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.132 2020/12/31 14:10:04 rillig Exp $ */
+/* $NetBSD: for.c,v 1.133 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.132 2020/12/31 14:10:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.133 2021/01/09 16:06:09 rillig Exp $");
static int forLevel = 0; /* Nesting level */
@@ -478,7 +478,7 @@ ForReadMore(void *v_arg, size_t *out_len
ForSubstBody(f);
DEBUG1(FOR, "For: loop body:\n%s", f->curBody.data);
- f->sub_next += f->vars.len;
+ f->sub_next += (unsigned int)f->vars.len;
*out_len = f->curBody.len;
return f->curBody.data;
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.394 src/usr.bin/make/job.c:1.395
--- src/usr.bin/make/job.c:1.394 Fri Jan 8 21:46:50 2021
+++ src/usr.bin/make/job.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.394 2021/01/08 21:46:50 sjg Exp $ */
+/* $NetBSD: job.c,v 1.395 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -143,7 +143,7 @@
#include "trace.h"
/* "@(#)job.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: job.c,v 1.394 2021/01/08 21:46:50 sjg Exp $");
+MAKE_RCSID("$NetBSD: job.c,v 1.395 2021/01/09 16:06:09 rillig Exp $");
/*
* A shell defines how the commands are run. All commands for a target are
@@ -599,6 +599,7 @@ JobCondPassSig(int signo)
*
* Sends a token on the child exit pipe to wake us up from select()/poll().
*/
+/*ARGSUSED*/
static void
JobChildSig(int signo MAKE_ATTR_UNUSED)
{
@@ -609,6 +610,7 @@ JobChildSig(int signo MAKE_ATTR_UNUSED)
/* Resume all stopped jobs. */
+/*ARGSUSED*/
static void
JobContinueSig(int signo MAKE_ATTR_UNUSED)
{
@@ -2065,8 +2067,10 @@ Job_CatchOutput(void)
switch (count) {
case 0:
Punt("unexpected eof on token pipe");
+ /*NOTREACHED*/
case -1:
Punt("token pipe read: %s", strerror(errno));
+ /*NOTREACHED*/
case 1:
if (token == DO_JOB_RESUME[0])
/*
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.509 src/usr.bin/make/main.c:1.510
--- src/usr.bin/make/main.c:1.509 Fri Jan 8 21:46:50 2021
+++ src/usr.bin/make/main.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.509 2021/01/08 21:46:50 sjg Exp $ */
+/* $NetBSD: main.c,v 1.510 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -110,7 +110,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.509 2021/01/08 21:46:50 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.510 2021/01/09 16:06:09 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1012,11 +1012,11 @@ InitVarMachineArch(void)
const int mib[2] = { CTL_HW, HW_MACHINE_ARCH };
size_t len = sizeof machine_arch_buf;
- if (sysctl(mib, __arraycount(mib), machine_arch_buf,
- &len, NULL, 0) < 0) {
- (void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname,
- strerror(errno));
- exit(2);
+ if (sysctl(mib, (unsigned int)__arraycount(mib),
+ machine_arch_buf, &len, NULL, 0) < 0) {
+ (void)fprintf(stderr, "%s: sysctl failed (%s).\n",
+ progname, strerror(errno));
+ exit(2);
}
return machine_arch_buf;
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.166 src/usr.bin/make/meta.c:1.167
--- src/usr.bin/make/meta.c:1.166 Thu Dec 31 17:39:36 2020
+++ src/usr.bin/make/meta.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.166 2020/12/31 17:39:36 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.167 2021/01/09 16:06:09 rillig Exp $ */
/*
* Implement 'meta' mode.
@@ -403,7 +403,7 @@ printCMDs(GNode *gn, FILE *fp)
} \
return FALSE; \
} \
-} while (0)
+} while (/*CONSTCOND*/0)
/*
@@ -1694,7 +1694,7 @@ meta_compat_parent(pid_t child)
fflush(stdout);
buf[nread] = '\0';
meta_job_output(NULL, buf, "");
- } while (0);
+ } while (/*CONSTCOND*/0);
if (metafd != -1 && FD_ISSET(metafd, &readfds)) {
if (meta_job_event(NULL) <= 0)
metafd = -1;
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.333 src/usr.bin/make/suff.c:1.334
--- src/usr.bin/make/suff.c:1.333 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/suff.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.333 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.334 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.333 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.334 2021/01/09 16:06:09 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -615,6 +615,7 @@ Suff_AddTransform(const char *name)
gn->type = OP_TRANSFORM;
{
+ /* TODO: Avoid the redundant parsing here. */
Boolean ok = ParseTransform(name, &srcSuff, &targSuff);
assert(ok);
(void)ok;
@@ -1012,6 +1013,7 @@ Candidate_New(char *name, char *prefix,
}
/* Add a new candidate to the list. */
+/*ARGSUSED*/
static void
CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ,
Suffix *suff, const char *debug_tag)
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.778 src/usr.bin/make/var.c:1.779
--- src/usr.bin/make/var.c:1.778 Wed Dec 30 10:03:16 2020
+++ src/usr.bin/make/var.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.778 2020/12/30 10:03:16 rillig Exp $ */
+/* $NetBSD: var.c,v 1.779 2021/01/09 16:06:09 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.778 2020/12/30 10:03:16 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.779 2021/01/09 16:06:09 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -1235,6 +1235,7 @@ typedef void (*ModifyWordsCallback)(cons
* Callback for ModifyWords to implement the :H modifier.
* Add the dirname of the given word to the buffer.
*/
+/*ARGSUSED*/
static void
ModifyWord_Head(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1249,6 +1250,7 @@ ModifyWord_Head(const char *word, SepBuf
* Callback for ModifyWords to implement the :T modifier.
* Add the basename of the given word to the buffer.
*/
+/*ARGSUSED*/
static void
ModifyWord_Tail(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1259,6 +1261,7 @@ ModifyWord_Tail(const char *word, SepBuf
* Callback for ModifyWords to implement the :E modifier.
* Add the filename suffix of the given word to the buffer, if it exists.
*/
+/*ARGSUSED*/
static void
ModifyWord_Suffix(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1271,6 +1274,7 @@ ModifyWord_Suffix(const char *word, SepB
* Callback for ModifyWords to implement the :R modifier.
* Add the basename of the given word to the buffer.
*/
+/*ARGSUSED*/
static void
ModifyWord_Root(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED)
{
@@ -1690,6 +1694,7 @@ VarSelectWords(char sep, Boolean oneBigW
* Callback for ModifyWords to implement the :tA modifier.
* Replace each word with the result of realpath() if successful.
*/
+/*ARGSUSED*/
static void
ModifyWord_Realpath(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
{
@@ -2789,6 +2794,7 @@ ApplyModifier_Quote(const char **pp, con
return AMR_UNKNOWN;
}
+/*ARGSUSED*/
static void
ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED)
{
@@ -3105,7 +3111,7 @@ ApplyModifier_Order(const char **pp, con
/* :? then : else */
static ApplyModifierResult
-ApplyModifier_IfElse(const char **pp, const char *val, ApplyModifiersState *st)
+ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st)
{
char *then_expr, *else_expr;
VarParseResult res;
@@ -3461,7 +3467,7 @@ ApplyModifier(const char **pp, const cha
case 'S':
return ApplyModifier_Subst(pp, val, st);
case '?':
- return ApplyModifier_IfElse(pp, val, st);
+ return ApplyModifier_IfElse(pp, st);
#ifndef NO_REGEX
case 'C':
return ApplyModifier_Regex(pp, val, st);
Index: src/usr.bin/make/filemon/filemon_ktrace.c
diff -u src/usr.bin/make/filemon/filemon_ktrace.c:1.9 src/usr.bin/make/filemon/filemon_ktrace.c:1.10
--- src/usr.bin/make/filemon/filemon_ktrace.c:1.9 Thu Dec 31 17:39:36 2020
+++ src/usr.bin/make/filemon/filemon_ktrace.c Sat Jan 9 16:06:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_ktrace.c,v 1.9 2020/12/31 17:39:36 rillig Exp $ */
+/* $NetBSD: filemon_ktrace.c,v 1.10 2021/01/09 16:06:09 rillig Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -130,6 +130,7 @@ struct filemon_state {
char *path[/*npath*/];
};
+/*ARGSUSED*/
static int
compare_filemon_states(void *cookie, const void *na, const void *nb)
{
@@ -147,6 +148,7 @@ compare_filemon_states(void *cookie, con
return 0;
}
+/*ARGSUSED*/
static int
compare_filemon_key(void *cookie, const void *n, const void *k)
{
@@ -581,7 +583,7 @@ top: /* If the child has exited, nothing
}
static struct filemon_state *
-syscall_enter(struct filemon *F,
+syscall_enter(
const struct filemon_key *key, const struct ktr_syscall *call,
unsigned npath,
void (*show)(struct filemon *, const struct filemon_state *,
@@ -663,7 +665,7 @@ static void
show_execve(struct filemon *F, const struct filemon_state *S,
const struct ktr_sysret *ret)
{
- return show_paths(F, S, ret, "E");
+ show_paths(F, S, ret, "E");
}
static void
@@ -751,18 +753,20 @@ show_rename(struct filemon *F, const str
show_paths(F, S, ret, "M");
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_chdir(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 1, &show_chdir);
+ return syscall_enter(key, call, 1, &show_chdir);
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_execve(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 1, &show_execve);
+ return syscall_enter(key, call, 1, &show_execve);
}
static struct filemon_state *
@@ -782,20 +786,23 @@ filemon_sys_exit(struct filemon *F, cons
return NULL;
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_fork(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 0, &show_fork);
+ return syscall_enter(key, call, 0, &show_fork);
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_link(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 2, &show_link);
+ return syscall_enter(key, call, 2, &show_link);
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_open(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
@@ -808,15 +815,16 @@ filemon_sys_open(struct filemon *F, cons
flags = (int)args[1];
if ((flags & O_RDWR) == O_RDWR)
- return syscall_enter(F, key, call, 1, &show_open_readwrite);
+ return syscall_enter(key, call, 1, &show_open_readwrite);
else if ((flags & O_WRONLY) == O_WRONLY)
- return syscall_enter(F, key, call, 1, &show_open_write);
+ return syscall_enter(key, call, 1, &show_open_write);
else if ((flags & O_RDONLY) == O_RDONLY)
- return syscall_enter(F, key, call, 1, &show_open_read);
+ return syscall_enter(key, call, 1, &show_open_read);
else
return NULL; /* XXX Do we care if no read or write? */
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_openat(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
@@ -831,47 +839,47 @@ filemon_sys_openat(struct filemon *F, co
if (fd == AT_CWD) {
if ((flags & O_RDWR) == O_RDWR)
- return syscall_enter(F, key, call, 1,
+ return syscall_enter(key, call, 1,
&show_open_readwrite);
else if ((flags & O_WRONLY) == O_WRONLY)
- return syscall_enter(F, key, call, 1,
- &show_open_write);
+ return syscall_enter(key, call, 1, &show_open_write);
else if ((flags & O_RDONLY) == O_RDONLY)
- return syscall_enter(F, key, call, 1, &show_open_read);
+ return syscall_enter(key, call, 1, &show_open_read);
else
return NULL;
} else {
if ((flags & O_RDWR) == O_RDWR)
- return syscall_enter(F, key, call, 1,
+ return syscall_enter(key, call, 1,
&show_openat_readwrite);
else if ((flags & O_WRONLY) == O_WRONLY)
- return syscall_enter(F, key, call, 1,
- &show_openat_write);
+ return syscall_enter(key, call, 1, &show_openat_write);
else if ((flags & O_RDONLY) == O_RDONLY)
- return syscall_enter(F, key, call, 1,
- &show_openat_read);
+ return syscall_enter(key, call, 1, &show_openat_read);
else
return NULL;
}
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_symlink(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 2, &show_symlink);
+ return syscall_enter(key, call, 2, &show_symlink);
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_unlink(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 1, &show_unlink);
+ return syscall_enter(key, call, 1, &show_unlink);
}
+/*ARGSUSED*/
static struct filemon_state *
filemon_sys_rename(struct filemon *F, const struct filemon_key *key,
const struct ktr_syscall *call)
{
- return syscall_enter(F, key, call, 2, &show_rename);
+ return syscall_enter(key, call, 2, &show_rename);
}
