From 326f1e3d88dab158b8aad8c49b96fa292b5912e5 Mon Sep 17 00:00:00 2001 From: rob-wing <98866084+rob-wing@users.noreply.github.com> Date: Thu, 2 Feb 2023 14:16:40 -0900 Subject: [PATCH] zfs_main.c: fix unused variable error with GCC zfs_setproctitle_init() is stubbed out on FreeBSD. Reviewed-by: Ryan Moeller Reviewed-by: Ameer Hamza Reviewed-by: Brian Behlendorf Reviewed-by: Richard Yao Signed-off-by: Rob Wing Closes #14441 --- cmd/zfs/zfs_main.c | 1 - include/libzutil.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index cec025ce6d..1ffe805aab 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -8672,7 +8672,6 @@ main(int argc, char **argv) int i = 0; const char *cmdname; char **newargv; - extern char **environ; (void) setlocale(LC_ALL, ""); (void) setlocale(LC_NUMERIC, "C"); diff --git a/include/libzutil.h b/include/libzutil.h index 4d4bddaad5..948ac08cd7 100644 --- a/include/libzutil.h +++ b/include/libzutil.h @@ -183,6 +183,7 @@ _LIBZUTIL_H int printf_color(const char *color, const char *format, ...); _LIBZUTIL_H const char *zfs_basename(const char *path); _LIBZUTIL_H ssize_t zfs_dirnamelen(const char *path); #ifdef __linux__ +extern char **environ; _LIBZUTIL_H void zfs_setproctitle_init(int argc, char *argv[], char *envp[]); _LIBZUTIL_H void zfs_setproctitle(const char *fmt, ...); #else