c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 18:34:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Re-fix -Wwrite-strings on FreeBSD

Browse Source 
Follow up fix for a926aab902.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13348
Closes #13610
This commit is contained in:
наб 2022-06-30 20:31:09 +02:00 committed by GitHub
parent eefe83eaa6
commit 6fca6195cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libspl/include/os/freebsd/sys/mnttab.h
View File

@ -79,7 +79,7 @@ extern int _sol_getmntent(FILE *fp, struct mnttab *mp);
extern int getextmntent(const char *path, struct extmnttab *entry, extern int getextmntent(const char *path, struct extmnttab *entry,
struct stat64 *statbuf); struct stat64 *statbuf);
extern void statfs2mnttab(struct statfs *sfs, struct mnttab *mp); extern void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
extern char *hasmntopt(struct mnttab *mnt, char *opt); extern char *hasmntopt(struct mnttab *mnt, const char *opt);
extern int getmntent(FILE *fp, struct mnttab *mp); extern int getmntent(FILE *fp, struct mnttab *mp);
#endif #endif

2
lib/libspl/os/freebsd/mnttab.c
View File

@ -67,7 +67,7 @@ mntopt(char **p)
} }
char * char *
hasmntopt(struct mnttab *mnt, char *opt) hasmntopt(struct mnttab *mnt, const char *opt)
{ {
char tmpopts[MNT_LINE_MAX]; char tmpopts[MNT_LINE_MAX];
char *f, *opts = tmpopts; char *f, *opts = tmpopts;

2
lib/libzfs/os/freebsd/libzfs_zmount.c
View File

@ -75,7 +75,7 @@ build_iovec(struct iovec **iov, int *iovlen, const char *name, void *val,
static int static int
do_mount_(const char *spec, const char *dir, int mflag, do_mount_(const char *spec, const char *dir, int mflag,
char *dataptr, int datalen, char *optptr, int optlen) char *dataptr, int datalen, const char *optptr, int optlen)
{ {
struct iovec *iov; struct iovec *iov;
char *optstr, *p, *tofree; char *optstr, *p, *tofree;

2
module/os/freebsd/zfs/zfs_acl.c
View File

@ -1669,7 +1669,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr,
acl_ids->z_fgid = 0; acl_ids->z_fgid = 0;
} }
if (acl_ids->z_fgid == 0) { if (acl_ids->z_fgid == 0) {
char *domain; const char *domain;
uint32_t rid; uint32_t rid;
acl_ids->z_fgid = dzp->z_gid; acl_ids->z_fgid = dzp->z_gid;