Skip to content

Commit b035c6f

Browse files
committed
illumos: silence warning from nvlist char * types
1 parent c576303 commit b035c6f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

pivy-zfs.c

+12
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,15 @@ cmd_unlock(const char *fsname)
208208
zfs_handle_t *ds;
209209
nvlist_t *props, *prop;
210210
char *description;
211+
/*
212+
* illumos libnvpair has the output args as 'char **'
213+
* but on ZoL they changed it to 'const char **'
214+
*/
215+
#if defined(__sun)
216+
char *b64;
217+
#else
211218
const char *b64;
219+
#endif
212220
char *nb64;
213221
struct sshbuf *buf;
214222
struct ebox *ebox, *nebox;
@@ -391,7 +399,11 @@ cmd_rekey(const char *fsname)
391399
zfs_handle_t *ds;
392400
nvlist_t *props, *prop;
393401
char *description;
402+
#if defined(__sun)
403+
char *b64;
404+
#else
394405
const char *b64;
406+
#endif
395407
char *nb64;
396408
struct sshbuf *buf;
397409
struct ebox *ebox = NULL, *nebox;

0 commit comments

Comments
 (0)