summaryrefslogtreecommitdiff
path: root/res/res_stasis_playback.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2015-04-09 12:57:21 +0000
committerMatthew Jordan <mjordan@digium.com>2015-04-09 12:57:21 +0000
commitea0098724efbd64a06b3103d19bb5f711f6f3cd7 (patch)
tree80ffc2e721dd3fde80fa9ef914a5f523fdfb3df1 /res/res_stasis_playback.c
parent2201e2734077c07648029f165d1a6a89f99e07c0 (diff)
clang compiler warnings: Fix autological comparisons
This fixes autological comparison warnings in the following: * chan_skinny: letohl may return a signed or unsigned value, depending on the macro chosen * func_curl: Provide a specific cast to CURLoption to prevent mismatch * cel: Fix enum comparisons where the enum can never be negative * enum: Fix comparison of return result of dn_expand, which returns a signed int value * event: Fix enum comparisons where the enum can never be negative * indications: tone_data.freq1 and freq2 are unsigned, and hence can never be negative * presencestate: Use the actual enum value for INVALID state * security_events: Fix enum comparisons where the enum can never be negative * udptl: Don't bother to check if the return value from encode_length is less than 0, as it returns an unsigned int * translate: Since the parameters are unsigned int, don't bother checking to see if they are negative. The cast to unsigned int would already blow past the matrix bounds. * res_pjsip_exten_state: Use a temporary value to cache the return of ast_hint_presence_state * res_stasis_playback: Fix enum comparisons where the enum can never be negative * res_stasis_recording: Add an enum value for the case where the recording operation is in error; fix enum comparisons * resource_bridges: Use enum value as opposed to -1 * resource_channels: Use enum value as opposed to -1 Review: https://reviewboard.asterisk.org/r/4533 ASTERISK-24917 Reported by: dkdegroot patches: rb4533.patch submitted by dkdegroot (License 6600) ........ Merged revisions 434469 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 434470 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_stasis_playback.c')
-rw-r--r--res/res_stasis_playback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index 1de774ff5..2eac55f19 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -629,9 +629,9 @@ enum stasis_playback_oper_results stasis_app_playback_operation(
playback_opreation_cb cb;
SCOPED_AO2LOCK(lock, playback);
- ast_assert(playback->state >= 0 && playback->state < STASIS_PLAYBACK_STATE_MAX);
+ ast_assert(playback->state < STASIS_PLAYBACK_STATE_MAX);
- if (operation < 0 || operation >= STASIS_PLAYBACK_MEDIA_OP_MAX) {
+ if (operation >= STASIS_PLAYBACK_MEDIA_OP_MAX) {
ast_log(LOG_ERROR, "Invalid playback operation %u\n", operation);
return -1;
}