diff options
author | Ed Schouten <ed@FreeBSD.org> | 2012-10-19 14:49:42 +0000 |
---|---|---|
committer | Ed Schouten <ed@FreeBSD.org> | 2012-10-19 14:49:42 +0000 |
commit | bf70becee6ff4798acdcfd586a88ad38b7b17495 (patch) | |
tree | ddffe542a2e921ec48c73d322a2046f559a9d74f /usr.sbin/mfiutil | |
parent | 39893d565a6c4b948fc0ba1b8c22ee1d57f2aaa4 (diff) | |
download | src-test2-bf70becee6ff4798acdcfd586a88ad38b7b17495.tar.gz src-test2-bf70becee6ff4798acdcfd586a88ad38b7b17495.zip |
More -Wmissing-variable-declarations fixes.
In addition to adding `static' where possible:
- bin/date: Move `retval' into extern.h to make it visible to date.c.
- bin/ed: Move globally used variables into ed.h.
- sbin/camcontrol: Move `verbose' into camcontrol.h and fix shadow warnings.
- usr.bin/calendar: Remove unneeded variables.
- usr.bin/chat: Make `line' local instead of global.
- usr.bin/elfdump: Comment out unneeded function.
- usr.bin/rlogin: Use _Noreturn instead of __dead2.
- usr.bin/tset: Pull `Ospeed' into extern.h.
- usr.sbin/mfiutil: Put global variables in mfiutil.h.
- usr.sbin/pkg: Remove unused `os_corres'.
- usr.sbin/quotaon, usr.sbin/repquota: Remove unused `qfname'.
Notes
Notes:
svn path=/head/; revision=241737
Diffstat (limited to 'usr.sbin/mfiutil')
-rw-r--r-- | usr.sbin/mfiutil/mfi_flash.c | 2 | ||||
-rw-r--r-- | usr.sbin/mfiutil/mfi_show.c | 2 | ||||
-rw-r--r-- | usr.sbin/mfiutil/mfiutil.c | 2 | ||||
-rw-r--r-- | usr.sbin/mfiutil/mfiutil.h | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/mfiutil/mfi_flash.c b/usr.sbin/mfiutil/mfi_flash.c index 2601025a13f3..2b825291d3d6 100644 --- a/usr.sbin/mfiutil/mfi_flash.c +++ b/usr.sbin/mfiutil/mfi_flash.c @@ -42,8 +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) { diff --git a/usr.sbin/mfiutil/mfi_show.c b/usr.sbin/mfiutil/mfi_show.c index 28a260403918..c8b4377a1d3e 100644 --- a/usr.sbin/mfiutil/mfi_show.c +++ b/usr.sbin/mfiutil/mfi_show.c @@ -570,8 +570,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) { diff --git a/usr.sbin/mfiutil/mfiutil.c b/usr.sbin/mfiutil/mfiutil.c index 7a8833d3181d..b0b6353a779f 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; +int fw_name_width, fw_version_width, fw_date_width, fw_time_width; static void usage(void) diff --git a/usr.sbin/mfiutil/mfiutil.h b/usr.sbin/mfiutil/mfiutil.h index bb9366f8769a..c696a05dfd19 100644 --- a/usr.sbin/mfiutil/mfiutil.h +++ b/usr.sbin/mfiutil/mfiutil.h @@ -122,6 +122,7 @@ struct mfiutil_command { extern int mfi_unit; extern u_int mfi_opts; +extern int fw_name_width, fw_version_width, fw_date_width, fw_time_width; void mbox_store_ldref(uint8_t *mbox, union mfi_ld_ref *ref); void mbox_store_pdref(uint8_t *mbox, union mfi_pd_ref *ref); |