diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-04-08 11:45:05 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-04-08 11:45:05 +0000 |
| commit | b8fa8aa77534fae8cea46d67c15b49f9677879bb (patch) | |
| tree | 1d4088d8f73386445f3508cd53266a967271289b /res/res_smdi.c | |
| parent | 016fba12e2d1e4ca8a48af0a2090cb8a6b5a2272 (diff) | |
clang compiler warnings: Fix pointer-bool-converesion warnings
This patch fixes several warnings pointed out by the clang compiler.
* chan_pjsip: Removed check for data->text, as it will always be non-NULL.
* app_minivm: Fixed evaluation of etemplate->locale, which will always
evaluate to 'true'. This patch changes the evaluation to use
ast_strlen_zero.
* app_queue:
- Fixed evaluation of qe->parent->monfmt, which always evaluates to
true. Instead, we just check to see if the dereferenced pointer
evaluates to true.
- Fixed evaluation of mem->state_interface, wrapping it with a call to
ast_strlen_zero.
* res_smdi: Wrapped search_msg->mesg_desk_term with calls to ast_strlen_zero.
Review: https://reviewboard.asterisk.org/r/4541
ASTERISK-24917
Reported by: dkdegroot
patches:
rb4541.patch submitted by dkdegroot (License 6600)
........
Merged revisions 434285 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 434286 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_smdi.c')
| -rw-r--r-- | res/res_smdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_smdi.c b/res/res_smdi.c index 02f2e4a79..fc89d9efe 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -873,10 +873,10 @@ static int smdi_md_q_cmp_fn(void *obj, void *arg, int flags) switch (flags & OBJ_SEARCH_MASK) { case OBJ_SEARCH_OBJECT: - if (search_msg->mesg_desk_num) { + if (!ast_strlen_zero(search_msg->mesg_desk_num)) { cmp = strcmp(msg->mesg_desk_num, search_msg->mesg_desk_num); } - if (search_msg->mesg_desk_term) { + if (!ast_strlen_zero(search_msg->mesg_desk_term)) { cmp |= strcmp(msg->mesg_desk_term, search_msg->mesg_desk_term); } break; |