From: Sascha Wildner <saw@online.de>
Date: Sun, 28 Jun 2020 09:22:42 +0000 (+0200)
Subject: mfiutil(8): Fix building with -fno-common.
X-Git-Tag: v6.0.0rc1~955
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/381696a1174c6946d5343d48d2119abe0e831622

mfiutil(8): Fix building with -fno-common.

-fno-common will be default in future compilers (GCC 10, for example).

This removes some redundant code.

Taken-from: FreeBSD
---

diff --git a/usr.sbin/mfiutil/mfi_flash.c b/usr.sbin/mfiutil/mfi_flash.c
index 1940b1019d..8b7e2725a3 100644
--- a/usr.sbin/mfiutil/mfi_flash.c
+++ b/usr.sbin/mfiutil/mfi_flash.c
@@ -42,36 +42,6 @@
 
 #define	FLASH_BUF_SIZE	(64 * 1024)
 
-int fw_name_width, fw_version_width, fw_date_width, fw_time_width;
-
-static void
-scan_firmware(struct mfi_info_component *comp)
-{
-	int len;
-
-	len = strlen(comp->name);
-	if (fw_name_width < len)
-		fw_name_width = len;
-	len = strlen(comp->version);
-	if (fw_version_width < len)
-		fw_version_width = len;
-	len = strlen(comp->build_date);
-	if (fw_date_width < len)
-		fw_date_width = len;
-	len = strlen(comp->build_time);
-	if (fw_time_width < len)
-		fw_time_width = len;
-}
-
-static void
-display_firmware(struct mfi_info_component *comp)
-{
-
-	printf("%-*s  %-*s  %-*s  %-*s\n", fw_name_width, comp->name,
-	    fw_version_width, comp->version, fw_date_width, comp->build_date,
-	    fw_time_width, comp->build_time);
-}
-
 static int
 display_pending_firmware(int fd)
 {
@@ -96,9 +66,9 @@ display_pending_firmware(int fd)
 		info.pending_image_component_count = 8;
 	for (i = 0; i < info.pending_image_component_count; i++)
 		scan_firmware(&info.pending_image_component[i]);
-	display_firmware(&header);
+	display_firmware(&header, "");
 	for (i = 0; i < info.pending_image_component_count; i++)
-		display_firmware(&info.pending_image_component[i]);
+		display_firmware(&info.pending_image_component[i], "");
 
 	return (0);
 }
diff --git a/usr.sbin/mfiutil/mfi_show.c b/usr.sbin/mfiutil/mfi_show.c
index 0c1b481d8f..5c57b7cd9e 100644
--- a/usr.sbin/mfiutil/mfi_show.c
+++ b/usr.sbin/mfiutil/mfi_show.c
@@ -556,36 +556,6 @@ error:
 }
 MFI_COMMAND(show, drives, show_drives);
 
-int fw_name_width, fw_version_width, fw_date_width, fw_time_width;
-
-static void
-scan_firmware(struct mfi_info_component *comp)
-{
-	int len;
-
-	len = strlen(comp->name);
-	if (fw_name_width < len)
-		fw_name_width = len;
-	len = strlen(comp->version);
-	if (fw_version_width < len)
-		fw_version_width = len;
-	len = strlen(comp->build_date);
-	if (fw_date_width < len)
-		fw_date_width = len;
-	len = strlen(comp->build_time);
-	if (fw_time_width < len)
-		fw_time_width = len;
-}
-
-static void
-display_firmware(struct mfi_info_component *comp, const char *tag)
-{
-
-	printf("%-*s  %-*s  %-*s  %-*s  %s\n", fw_name_width, comp->name,
-	    fw_version_width, comp->version, fw_date_width, comp->build_date,
-	    fw_time_width, comp->build_time, tag);
-}
-
 static int
 show_firmware(int ac, __unused char **av)
 {
diff --git a/usr.sbin/mfiutil/mfiutil.c b/usr.sbin/mfiutil/mfiutil.c
index 55ed3e162d..91d024bca9 100644
--- a/usr.sbin/mfiutil/mfiutil.c
+++ b/usr.sbin/mfiutil/mfiutil.c
@@ -44,8 +44,8 @@ MFI_TABLE(top, stop);
 MFI_TABLE(top, abort);
 
 int mfi_unit;
-
 u_int mfi_opts;
+static int fw_name_width, fw_version_width, fw_date_width, fw_time_width;
 
 static void
 usage(void)
@@ -150,3 +150,31 @@ main(int ac, char **av)
 	warnx("Unknown command %s.", av[0]);
 	return (1);
 }
+
+void
+scan_firmware(struct mfi_info_component *comp)
+{
+	int len;
+
+	len = strlen(comp->name);
+	if (fw_name_width < len)
+		fw_name_width = len;
+	len = strlen(comp->version);
+	if (fw_version_width < len)
+		fw_version_width = len;
+	len = strlen(comp->build_date);
+	if (fw_date_width < len)
+		fw_date_width = len;
+	len = strlen(comp->build_time);
+	if (fw_time_width < len)
+		fw_time_width = len;
+}
+
+void
+display_firmware(struct mfi_info_component *comp, const char *tag)
+{
+
+	printf("%-*s  %-*s  %-*s  %-*s  %s\n", fw_name_width, comp->name,
+	    fw_version_width, comp->version, fw_date_width, comp->build_date,
+	    fw_time_width, comp->build_time, tag);
+}
diff --git a/usr.sbin/mfiutil/mfiutil.h b/usr.sbin/mfiutil/mfiutil.h
index fc849358d5..606f36fd24 100644
--- a/usr.sbin/mfiutil/mfiutil.h
+++ b/usr.sbin/mfiutil/mfiutil.h
@@ -114,4 +114,7 @@ void	print_ld(struct mfi_ld_info *info, int state_len);
 void	print_pd(struct mfi_pd_info *info, int state_len);
 void	dump_config(int fd, struct mfi_config_data *config, const char* msg_prefix);
 
+void	scan_firmware(struct mfi_info_component *comp);
+void	display_firmware(struct mfi_info_component *comp, const char *tag);
+
 #endif /* !__MFIUTIL_H__ */