Skip to content

Commit

Permalink
illumos: silence warning from nvlist char * types
Browse files Browse the repository at this point in the history
  • Loading branch information
arekinath committed Feb 12, 2024
1 parent c576303 commit b035c6f
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions pivy-zfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,15 @@ cmd_unlock(const char *fsname)
zfs_handle_t *ds;
nvlist_t *props, *prop;
char *description;
/*
* illumos libnvpair has the output args as 'char **'
* but on ZoL they changed it to 'const char **'
*/
#if defined(__sun)
char *b64;
#else
const char *b64;
#endif
char *nb64;
struct sshbuf *buf;
struct ebox *ebox, *nebox;
Expand Down Expand Up @@ -391,7 +399,11 @@ cmd_rekey(const char *fsname)
zfs_handle_t *ds;
nvlist_t *props, *prop;
char *description;
#if defined(__sun)
char *b64;
#else
const char *b64;
#endif
char *nb64;
struct sshbuf *buf;
struct ebox *ebox = NULL, *nebox;
Expand Down

0 comments on commit b035c6f

Please sign in to comment.