d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newfs_msdos: Fix warnings that arise when compiled for makefs

Browse Source 
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2022-04-29 09:16:54 -04:00
parent ff80dd034a
commit f775c417fd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/newfs_msdos/mkfs_msdos.c
View File

@ -222,7 +222,9 @@ static const u_int8_t bootcode[] = {
static volatile sig_atomic_t got_siginfo; static volatile sig_atomic_t got_siginfo;
static void infohandler(int); static void infohandler(int);
#ifndef MAKEFS
static int check_mounted(const char *, mode_t); static int check_mounted(const char *, mode_t);
#endif
static ssize_t getchunksize(void); static ssize_t getchunksize(void);
static int getstdfmt(const char *, struct bpb *); static int getstdfmt(const char *, struct bpb *);
static int getdiskinfo(int, const char *, const char *, int, struct bpb *); static int getdiskinfo(int, const char *, const char *, int, struct bpb *);
@ -800,6 +802,7 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op)
/* /*
* return -1 with error if file system is mounted. * return -1 with error if file system is mounted.
*/ */
#ifndef MAKEFS
static int static int
check_mounted(const char *fname, mode_t mode) check_mounted(const char *fname, mode_t mode)
{ {
@ -807,7 +810,6 @@ check_mounted(const char *fname, mode_t mode)
* If getmntinfo() is not available (e.g. Linux) don't check. This should * If getmntinfo() is not available (e.g. Linux) don't check. This should
* not be a problem since we will only be using makefs to create images. * not be a problem since we will only be using makefs to create images.
*/ */
#if !defined(MAKEFS)
struct statfs *mp; struct statfs *mp;
const char *s1, *s2; const char *s1, *s2;
size_t len; size_t len;
@ -832,9 +834,9 @@ check_mounted(const char *fname, mode_t mode)
return -1; return -1;
} }
} }
#endif
return 0; return 0;
} }
#endif
/* /*
* Get optimal I/O size * Get optimal I/O size
@ -977,6 +979,7 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag,
lp = &dlp; lp = &dlp;
} }
#else #else
(void)dtype;
/* In the makefs case we only support image files: */ /* In the makefs case we only support image files: */
compute_geometry_from_file(fd, fname, &dlp); compute_geometry_from_file(fd, fname, &dlp);
lp = &dlp; lp = &dlp;