 @@ -1,14 +1,14 @@
-/* $NetBSD: refuse_compat.c,v 1.2 2022/01/22 08:09:39 pho Exp $ */
+/* $NetBSD: refuse_compat.c,v 1.3 2022/01/23 21:07:28 rillig Exp $ */
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: refuse_compat.c,v 1.2 2022/01/22 08:09:39 pho Exp $");
+__RCSID("$NetBSD: refuse_compat.c,v 1.3 2022/01/23 21:07:28 rillig Exp $");
 #endif /* !lint */
 #include <fuse_internal.h>
 #include <string.h>
 /*
  * Compatibility symbols that had existed in old versions of
  * librefuse.
  */
 struct fuse_cmdline_opts_rev0 {
 	int singlethread;
 	int foreground;
 @@ -142,23 +142,23 @@ fuse_parse_cmdline(struct fuse_args *arg
     memcpy(opts, &tmp, sizeof(*opts));
     return 0;
+}
 /* librefuse once had a function fuse_unmount() for FUSE 3.0 but
  * without a version postfix. */
 __warn_references(
     fuse_unmount,
     "warning: reference to compatibility fuse_unmount();"
     " include <fuse.h> for correct reference")
 void
 fuse_unmount(struct fuse* fuse) {
-    return fuse_unmount_v30(fuse);
+    fuse_unmount_v30(fuse);
+}
 /* librefuse once had a function fuse_unmount_compat22() which was an
  * implementation of fuse_unmount() to be used when FUSE_USE_VERSION
  * was set to 22 or below. The function was actually a no-op. */
 void
 fuse_unmount_compat22(const char *mountpoint) {
     fuse_unmount_v11(mountpoint);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: v30.c,v 1.1 2022/01/22 08:09:40 pho Exp $ */
+/* $NetBSD: v30.c,v 1.2 2022/01/23 21:07:28 rillig Exp $ */
 /*
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,50 +21,50 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
  * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: v30.c,v 1.1 2022/01/22 08:09:40 pho Exp $");
+__RCSID("$NetBSD: v30.c,v 1.2 2022/01/23 21:07:28 rillig Exp $");
 #endif /* !lint */
 #include <fuse_internal.h>
 int
 fuse_mount_v30(struct fuse *fuse, const char *mountpoint) {
     return __fuse_mount(fuse, mountpoint);
+}
 void
 fuse_unmount_v30(struct fuse *fuse) {
     __fuse_unmount(fuse);
+}
 struct fuse *
 fuse_new_v30(struct fuse_args *args,
              const void *op, int op_version, void *user_data) {
     return __fuse_new(args, op, op_version, user_data);
+}
 void
 fuse_destroy_v30(struct fuse *fuse) {
-    return __fuse_destroy(fuse);
+    __fuse_destroy(fuse);
+}
 int
 fuse_loop_mt_v30(struct fuse *fuse, int clone_fd) {
     struct fuse_loop_config config = {
         .clone_fd         = clone_fd,
         .max_idle_threads = 10 /* The default value when "config" is NULL. */
     };
     return __fuse_loop_mt(fuse, &config);
+}
 int
 fuse_parse_cmdline_v30(struct fuse_args *args, struct fuse_cmdline_opts *opts) {