Module Name: src
Committed By: martin
Date: Fri Oct 25 16:22:48 UTC 2019
Modified Files:
src/sys/dev/filemon: filemon_wrapper.c
Log Message:
>From the compilers point of view sys_exit returns a value.
Adjust the filemon wrapper accordingly (newer gcc is unhappy with the
function pointer casts otherwise and the amd64/ALL kernel fails to build).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/filemon/filemon_wrapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/filemon/filemon_wrapper.c
diff -u src/sys/dev/filemon/filemon_wrapper.c:1.11 src/sys/dev/filemon/filemon_wrapper.c:1.12
--- src/sys/dev/filemon/filemon_wrapper.c:1.11 Wed Nov 25 07:34:49 2015
+++ src/sys/dev/filemon/filemon_wrapper.c Fri Oct 25 16:22:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_wrapper.c,v 1.11 2015/11/25 07:34:49 pgoyette Exp $ */
+/* $NetBSD: filemon_wrapper.c,v 1.12 2019/10/25 16:22:48 martin Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.11 2015/11/25 07:34:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.12 2019/10/25 16:22:48 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -43,7 +43,7 @@ static int filemon_wrapper_chdir(struct
register_t *);
static int filemon_wrapper_execve(struct lwp *, struct sys_execve_args *,
register_t *);
-static void filemon_wrapper_sys_exit(struct lwp *, struct sys_exit_args *,
+static int filemon_wrapper_sys_exit(struct lwp *, struct sys_exit_args *,
register_t *);
static int filemon_wrapper_fork(struct lwp *, const void *, register_t *);
static int filemon_wrapper_link(struct lwp *, struct sys_link_args *,
@@ -380,7 +380,7 @@ out:
}
-static void
+static int
filemon_wrapper_sys_exit(struct lwp * l, struct sys_exit_args * uap,
register_t * retval)
{
@@ -398,8 +398,7 @@ filemon_wrapper_sys_exit(struct lwp * l,
rw_exit(&filemon->fm_mtx);
}
- sys_exit(l, uap, retval);
- /* NOT REACHED */
+ return sys_exit(l, uap, retval);
}
static int
