Merge "Clang: change previous tautological-compare fixes."
This commit is contained in:
commit
1a8355622d
|
@ -199,7 +199,7 @@ const char *ast_event_get_type_name(const struct ast_event *event)
|
||||||
|
|
||||||
type = ast_event_get_type(event);
|
type = ast_event_get_type(event);
|
||||||
|
|
||||||
if (type >= ARRAY_LEN(event_names)) {
|
if ((unsigned int)type >= ARRAY_LEN(event_names)) {
|
||||||
ast_log(LOG_ERROR, "Invalid event type - '%u'\n", type);
|
ast_log(LOG_ERROR, "Invalid event type - '%u'\n", type);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
@ -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_json = ast_json_object_get(json, "SecurityEvent");
|
||||||
event_type = ast_json_integer_get(event_type_json);
|
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))) {
|
if (!(str = ast_str_create(SECURITY_EVENT_BUF_INIT_LEN))) {
|
||||||
return NULL;
|
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)
|
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);
|
ast_log(LOG_ERROR, "Invalid security event type %u\n", event_type);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -1172,7 +1172,7 @@ return_error:
|
||||||
|
|
||||||
int ast_security_event_report(const struct ast_security_event_common *sec)
|
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");
|
ast_log(LOG_ERROR, "Invalid security event type\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -629,7 +629,7 @@ enum stasis_playback_oper_results stasis_app_playback_operation(
|
||||||
playback_opreation_cb cb;
|
playback_opreation_cb cb;
|
||||||
SCOPED_AO2LOCK(lock, playback);
|
SCOPED_AO2LOCK(lock, playback);
|
||||||
|
|
||||||
ast_assert(playback->state < STASIS_PLAYBACK_STATE_MAX);
|
ast_assert((unsigned int)playback->state < STASIS_PLAYBACK_STATE_MAX);
|
||||||
|
|
||||||
if (operation >= STASIS_PLAYBACK_MEDIA_OP_MAX) {
|
if (operation >= STASIS_PLAYBACK_MEDIA_OP_MAX) {
|
||||||
ast_log(LOG_ERROR, "Invalid playback operation %u\n", operation);
|
ast_log(LOG_ERROR, "Invalid playback operation %u\n", operation);
|
||||||
|
|
|
@ -595,13 +595,13 @@ enum stasis_app_recording_oper_results stasis_app_recording_operation(
|
||||||
recording_operation_cb cb;
|
recording_operation_cb cb;
|
||||||
SCOPED_AO2LOCK(lock, recording);
|
SCOPED_AO2LOCK(lock, recording);
|
||||||
|
|
||||||
if (recording->state >= STASIS_APP_RECORDING_STATE_MAX) {
|
if ((unsigned int)recording->state >= STASIS_APP_RECORDING_STATE_MAX) {
|
||||||
ast_log(LOG_WARNING, "Invalid recording state %u\n",
|
ast_log(LOG_WARNING, "Invalid recording state %u\n",
|
||||||
recording->state);
|
recording->state);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (operation >= STASIS_APP_RECORDING_OPER_MAX) {
|
if ((unsigned int)operation >= STASIS_APP_RECORDING_OPER_MAX) {
|
||||||
ast_log(LOG_WARNING, "Invalid recording operation %u\n",
|
ast_log(LOG_WARNING, "Invalid recording operation %u\n",
|
||||||
operation);
|
operation);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue