[src/trunk]: src/sys/dev/filemon From the compilers point of view sys_exit re...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/302fa8b7fbca
branches:  trunk
changeset: 464819:302fa8b7fbca
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 25 16:22:48 2019 +0000

description:
>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).

diffstat:

 sys/dev/filemon/filemon_wrapper.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 781c5aaec078 -r 302fa8b7fbca sys/dev/filemon/filemon_wrapper.c
--- a/sys/dev/filemon/filemon_wrapper.c Fri Oct 25 12:49:58 2019 +0000
+++ b/sys/dev/filemon/filemon_wrapper.c Fri Oct 25 16:22:48 2019 +0000
@@ -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 @@
                                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 @@
 }
 
 
-static void
+static int
 filemon_wrapper_sys_exit(struct lwp * l, struct sys_exit_args * uap,
     register_t * retval)
 {
@@ -398,8 +398,7 @@
 
                rw_exit(&filemon->fm_mtx);
        }
-       sys_exit(l, uap, retval);
-       /* NOT REACHED */
+       return sys_exit(l, uap, retval);
 }
 
 static int