 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstyp.c,v 1.8 2020/01/01 08:56:41 tkusumi Exp $	*/
+/*	$NetBSD: fstyp.c,v 1.9 2020/01/01 09:08:52 tkusumi Exp $	*/
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * Copyright (c) 2016 The DragonFly Project
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tomohiro Kusumi <kusumi.tomohiro@gmail.com>.
+ *
  * This software was developed by Edward Tomasz Napierala under sponsorship
  * from the FreeBSD Foundation.
+ *
 @@ -25,27 +25,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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>
-__RCSID("$NetBSD: fstyp.c,v 1.8 2020/01/01 08:56:41 tkusumi Exp $");
+__RCSID("$NetBSD: fstyp.c,v 1.9 2020/01/01 09:08:52 tkusumi Exp $");
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>
 #include <iconv.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -78,28 +78,29 @@ static struct {
 	{ "ufs", &fstyp_ufs, false, NULL },
 	{ "hammer", &fstyp_hammer, false, NULL },
 	{ "hammer2", &fstyp_hammer2, false, NULL },
 #ifdef HAVE_ZFS
 	{ "zfs", &fstyp_zfs, true, NULL },
 #endif
 	{ NULL, NULL, NULL, NULL }
 };
 static struct {
 	const char	*name;
 	fsvtyp_function	function;
 	bool		unmountable;
 	const char	*precache_encoding;
 } fsvtypes[] = {
-	{ NULL, NULL, NULL }
+	{ NULL, NULL, NULL, NULL }
 };
 void *
 read_buf(FILE *fp, off_t off, size_t len)
+{
 	int error;
 	size_t nread;
 	void *buf;
 	error = fseeko(fp, off, SEEK_SET);
 	if (error != 0) {
 		warn("cannot seek to %jd", (uintmax_t)off);
 		return NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fstyp.h,v 1.7 2020/01/01 08:56:41 tkusumi Exp $	*/
+/*	$NetBSD: fstyp.h,v 1.8 2020/01/01 09:08:52 tkusumi Exp $	*/
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
  * Copyright (c) 2016 The DragonFly Project
  * Copyright (c) 2014 The FreeBSD Foundation
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tomohiro Kusumi <kusumi.tomohiro@gmail.com>.
+ *
  * This software was developed by Edward Tomasz Napierala under sponsorship
  * from the FreeBSD Foundation.
+ *
 @@ -48,31 +48,31 @@
 #define	EXFAT_ENC	"UCS-2LE"
 /*
  * NTFS itself is agnostic to encoding; it just stores 255 u16 wchars.  In
  * practice, UTF-16 seems expected for NTFS.  (Maybe also for exFAT.)
  */
 #define	NTFS_ENC	"UTF-16LE"
 extern bool	show_label;	/* -l flag */
 void	*read_buf(FILE *, off_t, size_t);
 char	*checked_strdup(const char *);
 void	rtrim(char *, size_t);
-int	fstyp_apfs(FILE *fp, char *label, size_t size);
+int	fstyp_apfs(FILE *, char *, size_t);
 int	fstyp_cd9660(FILE *, char *, size_t);
-int	fstyp_exfat(FILE *fp, char *label, size_t size);
+int	fstyp_exfat(FILE *, char *, size_t);
 int	fstyp_ext2fs(FILE *, char *, size_t);
-int	fstyp_hfsp(FILE *fp, char *label, size_t size);
+int	fstyp_hfsp(FILE *, char *, size_t);
 int	fstyp_msdosfs(FILE *, char *, size_t);
 int	fstyp_ntfs(FILE *, char *, size_t);
 int	fstyp_ufs(FILE *, char *, size_t);
 int	fstyp_hammer(FILE *, char *, size_t);
 int	fstyp_hammer2(FILE *, char *, size_t);
 #ifdef HAVE_ZFS
 int	fstyp_zfs(FILE *, char *, size_t);
 #endif
-int	fsvtyp_hammer(const char *blkdevs, char *label, size_t size);
+int	fsvtyp_hammer(const char *, char *, size_t);
-int	fsvtyp_hammer_partial(const char *blkdevs, char *label, size_t size);
+int	fsvtyp_hammer_partial(const char *, char *, size_t);
 #endif /* !FSTYP_H */