Module Name: src
Committed By: tkusumi
Date: Wed Jan 1 09:08:52 UTC 2020
Modified Files:
src/usr.sbin/fstyp: fstyp.c fstyp.h
Log Message:
fstyp: Cleanup and minor sync up with FreeBSD/DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/fstyp/fstyp.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/fstyp/fstyp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/fstyp/fstyp.c
diff -u src/usr.sbin/fstyp/fstyp.c:1.8 src/usr.sbin/fstyp/fstyp.c:1.9
--- src/usr.sbin/fstyp/fstyp.c:1.8 Wed Jan 1 08:56:41 2020
+++ src/usr.sbin/fstyp/fstyp.c Wed Jan 1 09:08:52 2020
@@ -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 @@ static struct {
const char *name;
fsvtyp_function function;
bool unmountable;
+ const char *precache_encoding;
} fsvtypes[] = {
- { NULL, NULL, NULL }
+ { NULL, NULL, NULL, NULL }
};
void *
Index: src/usr.sbin/fstyp/fstyp.h
diff -u src/usr.sbin/fstyp/fstyp.h:1.7 src/usr.sbin/fstyp/fstyp.h:1.8
--- src/usr.sbin/fstyp/fstyp.h:1.7 Wed Jan 1 08:56:41 2020
+++ src/usr.sbin/fstyp/fstyp.h Wed Jan 1 09:08:52 2020
@@ -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 @@ 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);
@@ -72,7 +72,7 @@ int fstyp_hammer2(FILE *, char *, size_t
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 */
