From: Eric Biggers <ebiggers@google.com>
Date: Sat, 21 Jan 2023 20:32:27 +0000 (-0800)
Subject: misc/tune2fs: fix -Wunused-variable warnings in handle_fslabel()
X-Git-Tag: v1.47.0~6
X-Git-Url: https://git.whamcloud.com/ff/hdf.git/log?p=tools%2Fe2fsprogs.git;a=commitdiff_plain;h=0352d353adbe6c5d6f1937e12c66e599b8657d72

misc/tune2fs: fix -Wunused-variable warnings in handle_fslabel()

These warnings show up in non-Linux builds.  To fix them, only declare
local variables when they are needed.

While we're here, also make handle_fslabel() static.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 2f7d9f3..458f7cf 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -3085,14 +3085,15 @@ fs_update_journal_user(struct ext2_super_block *sb, __u8 old_uuid[UUID_SIZE])
  *		1 on error
  *		-1 when the old method should be used
  */
-int handle_fslabel(int setlabel) {
+static int handle_fslabel(int setlabel)
+{
+#ifdef __linux__
 	errcode_t ret;
 	int mnt_flags, fd;
 	char label[FSLABEL_MAX];
 	int maxlen = FSLABEL_MAX - 1;
 	char mntpt[PATH_MAX + 1];
 
-#ifdef __linux__
 	ret = ext2fs_check_mount_point(device_name, &mnt_flags,
 					  mntpt, sizeof(mntpt));
 	if (ret) {