[src/trunk]: src/usr.sbin/fstyp fstyp: Cleanup and minor sync up with FreeBSD...

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

details:   https://anonhg.NetBSD.org/src/rev/2ec3e4c816e2
branches:  trunk
changeset: 968029:2ec3e4c816e2
user:      tkusumi <tkusumi%NetBSD.org@localhost>
date:      Wed Jan 01 09:08:52 2020 +0000

description:
fstyp: Cleanup and minor sync up with FreeBSD/DragonFlyBSD

diffstat:

 usr.sbin/fstyp/fstyp.c |   7 ++++---
 usr.sbin/fstyp/fstyp.h |  12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 4369c26ebe89 -r 2ec3e4c816e2 usr.sbin/fstyp/fstyp.c
--- a/usr.sbin/fstyp/fstyp.c    Wed Jan 01 09:08:28 2020 +0000
+++ b/usr.sbin/fstyp/fstyp.c    Wed Jan 01 09:08:52 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -35,7 +35,7 @@
  *
  */
 #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>
@@ -88,8 +88,9 @@
        const char      *name;
        fsvtyp_function function;
        bool            unmountable;
+       const char      *precache_encoding;
 } fsvtypes[] = {
-       { NULL, NULL, NULL }
+       { NULL, NULL, NULL, NULL }
 };
 
 void *
diff -r 4369c26ebe89 -r 2ec3e4c816e2 usr.sbin/fstyp/fstyp.h
--- a/usr.sbin/fstyp/fstyp.h    Wed Jan 01 09:08:28 2020 +0000
+++ b/usr.sbin/fstyp/fstyp.h    Wed Jan 01 09:08:52 2020 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -58,11 +58,11 @@
 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);
@@ -72,7 +72,7 @@
 int    fstyp_zfs(FILE *, char *, size_t);
 #endif
 
-int    fsvtyp_hammer(const char *blkdevs, char *label, size_t size);
-int    fsvtyp_hammer_partial(const char *blkdevs, char *label, size_t size);
+int    fsvtyp_hammer(const char *, char *, size_t);
+int    fsvtyp_hammer_partial(const char *, char *, size_t);
 
 #endif /* !FSTYP_H */