From: Matt Jordan Date: Fri, 24 Apr 2015 15:23:06 +0000 (-0500) Subject: Clang: Fix some more tautological-compare warnings. X-Git-Tag: 11.18.0-rc1~39^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb1e967cb9509696725f05e7417e52f2682b1a7;p=thirdparty%2Fasterisk.git Clang: Fix some more tautological-compare warnings. clang can warn about a so called tautological-compare, when it finds comparisons which are logically always true, and are therefore deemed unnecessary. Example: unsigned int x = 4; if (x > 0) // x is always going to be bigger than 0 Enum Case: Each enumeration is its own type. Enums are an integer type but they do not have to be *signed*. C leaves it up to the compiler as an implementation option what to consider the integer type of a particular enumeration is. Gcc treats an enum without negative values as an int while clang treats this enum as an unsigned int. rmudgett & mmichelson: cast the enum to (unsigned int) in assert. The cast does have an effect. For gcc, which seems to treat all enums as int, the cast to unsigned int will eliminate the possibility of negative values being allowed. For clang, which seems to treat enums without any negative members as unsigned int, the cast will have no effect. If for some reason in the future a negative value is ever added to the enum the assert will still catch the negative value. ASTERISK-24917 Change-Id: Ief23ef68916192b9b72dabe702b543ecfeca0b62 --- diff --git a/res/res_security_log.c b/res/res_security_log.c index 8611e3f592..bea4609087 100644 --- a/res/res_security_log.c +++ b/res/res_security_log.c @@ -120,7 +120,7 @@ static void security_event_cb(const struct ast_event *event, void *data) /* Note that the event type is guaranteed to be valid here. */ event_type = ast_event_get_ie_uint(event, AST_EVENT_IE_SECURITY_EVENT); - ast_assert(event_type >= 0 && event_type < AST_SECURITY_EVENT_NUM_TYPES); + ast_assert((unsigned int)event_type >= 0 && event_type < AST_SECURITY_EVENT_NUM_TYPES); ast_str_set(&str, 0, "%s=\"%s\"", ast_event_get_ie_type_name(AST_EVENT_IE_SECURITY_EVENT),