Merge "Clang: change previous tautological-compare fixes."

This commit is contained in:
Mark Michelson
2015-04-23 17:23:50 -05:00
committed by Gerrit Code Review
4 changed files with 7 additions and 7 deletions

View File

@@ -629,7 +629,7 @@ enum stasis_playback_oper_results stasis_app_playback_operation(
playback_opreation_cb cb;
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) {
ast_log(LOG_ERROR, "Invalid playback operation %u\n", operation);

View File

@@ -595,13 +595,13 @@ enum stasis_app_recording_oper_results stasis_app_recording_operation(
recording_operation_cb cb;
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",
recording->state);
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",
operation);
return -1;