From 81b9e5d1e77fa622579f08eac522cc03f90395f2 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@freedesktop.org>
Date: Thu, 30 Aug 2007 18:00:20 -0700
Subject: [PATCH] Sort warning options in lib.c and lib.h

Signed-off-by: Josh Triplett <josh@freedesktop.org>
---
 lib.c | 52 ++++++++++++++++++++++++++--------------------------
 lib.h | 25 ++++++++++++++-----------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/lib.c b/lib.c
index 22e2fe29..b40c8fb1 100644
--- a/lib.c
+++ b/lib.c
@@ -188,26 +188,26 @@ void die(const char *fmt, ...)
 static unsigned int pre_buffer_size;
 static char pre_buffer[8192];
 
-int Wdefault_bitfield_sign = 0;
-int Wone_bit_signed_bitfield = 1;
-int Wcast_truncate = 1;
+int Waddress_space = 1;
 int Wbitwise = 0;
-int Wtypesign = 0;
-int Wcontext = 1;
-int Wundefined_preprocessor = 0;
-int Wptr_subtraction_blows = 0;
 int Wcast_to_address_space = 0;
+int Wcast_truncate = 1;
+int Wcontext = 1;
 int Wdecl = 1;
-int Wtransparent_union = 1;
-int Wshadow = 0;
-int Waddress_space = 1;
-int Wenum_mismatch = 1;
+int Wdefault_bitfield_sign = 0;
 int Wdo_while = 0;
-int Wuninitialized = 1;
-int Wold_initializer = 1;
+int Wenum_mismatch = 1;
 int Wnon_pointer_null = 1;
+int Wold_initializer = 1;
+int Wone_bit_signed_bitfield = 1;
 int Wparen_string = 0;
+int Wptr_subtraction_blows = 0;
 int Wreturn_void = 0;
+int Wshadow = 0;
+int Wtransparent_union = 1;
+int Wtypesign = 0;
+int Wundefined_preprocessor = 0;
+int Wuninitialized = 1;
 
 int dbg_entry = 0;
 int dbg_dead = 0;
@@ -346,26 +346,26 @@ static const struct warning {
 	const char *name;
 	int *flag;
 } warnings[] = {
+	{ "address-space", &Waddress_space },
+	{ "bitwise", &Wbitwise },
 	{ "cast-to-as", &Wcast_to_address_space },
-	{ "decl", &Wdecl },
-	{ "one-bit-signed-bitfield", &Wone_bit_signed_bitfield },
 	{ "cast-truncate", &Wcast_truncate },
-	{ "ptr-subtraction-blows", &Wptr_subtraction_blows },
-	{ "default-bitfield-sign", &Wdefault_bitfield_sign },
-	{ "undef", &Wundefined_preprocessor },
-	{ "bitwise", &Wbitwise },
-	{ "typesign", &Wtypesign },
 	{ "context", &Wcontext },
-	{ "transparent-union", &Wtransparent_union },
-	{ "shadow", &Wshadow },
-	{ "address-space", &Waddress_space },
-	{ "enum-mismatch", &Wenum_mismatch },
+	{ "decl", &Wdecl },
+	{ "default-bitfield-sign", &Wdefault_bitfield_sign },
 	{ "do-while", &Wdo_while },
-	{ "uninitialized", &Wuninitialized },
-	{ "old-initializer", &Wold_initializer },
+	{ "enum-mismatch", &Wenum_mismatch },
 	{ "non-pointer-null", &Wnon_pointer_null },
+	{ "old-initializer", &Wold_initializer },
+	{ "one-bit-signed-bitfield", &Wone_bit_signed_bitfield },
 	{ "paren-string", &Wparen_string },
+	{ "ptr-subtraction-blows", &Wptr_subtraction_blows },
 	{ "return-void", &Wreturn_void },
+	{ "shadow", &Wshadow },
+	{ "transparent-union", &Wtransparent_union },
+	{ "typesign", &Wtypesign },
+	{ "undef", &Wundefined_preprocessor },
+	{ "uninitialized", &Wuninitialized },
 };
 
 enum {
diff --git a/lib.h b/lib.h
index aacafea2..a4a630e4 100644
--- a/lib.h
+++ b/lib.h
@@ -87,24 +87,27 @@ extern char **handle_switch(char *arg, char **next);
 extern void add_pre_buffer(const char *fmt, ...) FORMAT_ATTR(1);
 
 extern int preprocess_only;
-extern int Wptr_subtraction_blows;
-extern int Wdefault_bitfield_sign;
-extern int Wundefined_preprocessor;
-extern int Wbitwise, Wtypesign, Wcontext;
-extern int Wtransparent_union;
+
 extern int Waddress_space;
+extern int Wbitwise;
 extern int Wcast_to_address_space;
-extern int Wenum_mismatch;
-extern int Wdecl;
-extern int Wone_bit_signed_bitfield;
-extern int Wshadow;
 extern int Wcast_truncate;
+extern int Wcontext;
+extern int Wdecl;
+extern int Wdefault_bitfield_sign;
 extern int Wdo_while;
-extern int Wuninitialized;
-extern int Wold_initializer;
+extern int Wenum_mismatch;
 extern int Wnon_pointer_null;
+extern int Wold_initializer;
+extern int Wone_bit_signed_bitfield;
 extern int Wparen_string;
+extern int Wptr_subtraction_blows;
 extern int Wreturn_void;
+extern int Wshadow;
+extern int Wtransparent_union;
+extern int Wtypesign;
+extern int Wundefined_preprocessor;
+extern int Wuninitialized;
 
 extern int dbg_entry;
 extern int dbg_dead;
-- 
2.11.4.GIT