From 8eabf1a6a321a3eb6d38150a02d7941fa5a0fc70 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sun, 31 Aug 2008 12:56:19 +0000 Subject: [PATCH] Sort. [r21586] --- warning.c | 8 ++++---- warning.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/warning.c b/warning.c index 6718586..bb00d94 100644 --- a/warning.c +++ b/warning.c @@ -40,8 +40,8 @@ warning_t warning = { .multichar = true, .nested_externs = false, .nonnull = true, - .redundant_decls = true, .pointer_arith = true, + .redundant_decls = true, .return_type = true, .s_are_errors = false, .shadow = false, @@ -85,12 +85,13 @@ void set_warning_opt(const char *const opt) SET(implicit_int); SET(main); SET(nonnull); - SET(redundant_decls); SET(pointer_arith); + SET(redundant_decls); SET(return_type); SET(shadow); SET(sign_compare); SET(strict_prototypes); + SET(switch_enum); SET(unknown_pragmas); SET(unreachable_code); SET(unused_function); @@ -98,7 +99,6 @@ void set_warning_opt(const char *const opt) SET(unused_parameter); SET(unused_value); SET(unused_variable); - SET(switch_enum); } OPT("attribute", attribute); OPT("char-subscripts", char_subscripts); @@ -135,8 +135,8 @@ void set_warning_opt(const char *const opt) OPT("multichar", multichar); OPT("nested-externs", nested_externs); OPT("nonnull", nonnull); - OPT("redundant-decls", redundant_decls); OPT("pointer_arith", pointer_arith); + OPT("redundant-decls", redundant_decls); OPT("return-type", return_type); OPT("shadow", shadow); OPT("sign-compare", sign_compare); diff --git a/warning.h b/warning.h index 6c70326..cb3e2cf 100644 --- a/warning.h +++ b/warning.h @@ -31,8 +31,6 @@ typedef struct warning_t { #endif bool attribute:1; /**< Warn if an unexpected `__attribute__' is used or function attributes applied to variables, etc. */ bool char_subscripts:1; /**< Warn if an array subscript has the type 'char' */ - bool format:1; /**< Check printf-style format strings */ - bool nonnull:1; /**< Warn about passing a null pointer for arguments marked nonnull */ #if 0 // TODO bool cast_align:1; /**< Warn whenever a pointer is cast such that the required alignment of the target is increased */ bool cast_qual:1; /**< Warn whenever a pointer is cast so as to remove a type qualifier from the target type */ @@ -49,6 +47,7 @@ typedef struct warning_t { #endif bool fatal_errors:1; /**< First error stops the compilation */ bool float_equal:1; /**< Warn if floating point values are used in equality comparisons */ + bool format:1; /**< Check printf-style format strings */ bool implicit_function_declaration:1; /**< Warn whenever a function is used before being declared */ bool implicit_int:1; /**< Warn when a declaration does not specify a type */ #if 0 // TODO @@ -67,6 +66,7 @@ typedef struct warning_t { bool missing_prototypes:1; /**< Warn if a global function is defined without a previous prototype declaration */ bool multichar:1; /**< Warn if a multicharacter constant ('FOOF') is used. */ bool nested_externs:1; /**< Warn if an 'extern' declaration is encountered within a function */ + bool nonnull:1; /**< Warn about passing a null pointer for arguments marked nonnull */ #if 0 // TODO bool packed:1; /**< Warn if a structure is given the packed attribute, but the packed attribute has no effect on the layout or size of the structure */ bool padded:1; /**< Warn if padding is included in a structure, either to align an element of the structure or to align the whole structure */ -- 2.20.1