summaryrefslogtreecommitdiff
path: root/main/security_events.c
diff options
context:
space:
mode:
authorDiederik de Groot <ddegroot@talon.nl>2015-04-23 15:00:42 +0200
committerMatt Jordan <mjordan@digium.com>2015-04-23 11:39:13 -0500
commitca7193167e541a5b6ec092225eb4a60af7abd63f (patch)
tree44e730f868b9767db6143be4dc9b1c63365eaf2b /main/security_events.c
parent7ccaf8aa46ae98be8289180d6b68c17f177e4f2f (diff)
Clang: change previous tautological-compare fixes.
clang can warn about a so called tautological-compare, when it finds comparisons which are logically always true, and are therefor deemed unnecessary. Exanple: 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 particu- lar 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: I0557ae0154a0b7de68883848a609309cdf0aee6a
Diffstat (limited to 'main/security_events.c')
-rw-r--r--main/security_events.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main/security_events.c b/main/security_events.c
index 0da62a20a..9db932d85 100644
--- a/main/security_events.c
+++ b/main/security_events.c
@@ -428,7 +428,7 @@ static struct ast_manager_event_blob *security_event_to_ami_blob(struct ast_json
event_type_json = ast_json_object_get(json, "SecurityEvent");
event_type = ast_json_integer_get(event_type_json);
- ast_assert(event_type >= 0 && event_type < AST_SECURITY_EVENT_NUM_TYPES);
+ ast_assert((unsigned int)event_type < AST_SECURITY_EVENT_NUM_TYPES);
if (!(str = ast_str_create(SECURITY_EVENT_BUF_INIT_LEN))) {
return NULL;
@@ -886,7 +886,7 @@ const char *ast_security_event_severity_get_name(
static int check_event_type(const enum ast_security_event_type event_type)
{
- if (event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
+ if ((unsigned int)event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
ast_log(LOG_ERROR, "Invalid security event type %u\n", event_type);
return -1;
}
@@ -1172,7 +1172,7 @@ return_error:
int ast_security_event_report(const struct ast_security_event_common *sec)
{
- if (sec->event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
+ if ((unsigned int)sec->event_type >= AST_SECURITY_EVENT_NUM_TYPES) {
ast_log(LOG_ERROR, "Invalid security event type\n");
return -1;
}