[git commit] catv: suppress compiler warning

Denys Vlasenko vda.linux at googlemail.com
Mon Feb 3 02:27:53 UTC 2014


commit: http://git.busybox.net/busybox/commit/?id=69a12fa7906d2dcdb5d8e124643a4e0f7865417a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

The warning was:
warning: typedef 'BUG_const_mismatch' locally defined but not used [-Wunused-local-typedefs]

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/catv.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/coreutils/catv.c b/coreutils/catv.c
index e3499c5..6bb73ba 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -20,20 +20,22 @@
 
 #include "libbb.h"
 
-int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int catv_main(int argc UNUSED_PARAM, char **argv)
-{
-	int retval = EXIT_SUCCESS;
-	int fd;
-	unsigned opts;
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
 #define CATV_OPT_v (1<<2)
-	typedef char BUG_const_mismatch[
+struct BUG_const_mismatch {
+	char BUG_const_mismatch[
 		CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS
 		? 1 : -1
 	];
+};
 
+int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int catv_main(int argc UNUSED_PARAM, char **argv)
+{
+	int retval = EXIT_SUCCESS;
+	int fd;
+	unsigned opts;
 	opts = getopt32(argv, "etv");
 	argv += optind;
 #if 0 /* These consts match, we can just pass "opts" to visible() */


More information about the busybox-cvs mailing list