]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
app_voicemail: Avoid always true when using pointer address.
authorAlexander Traud <pabstraud@compuserve.com>
Mon, 29 Jan 2018 16:00:52 +0000 (17:00 +0100)
committerAlexander Traud <pabstraud@compuserve.com>
Mon, 29 Jan 2018 16:01:44 +0000 (10:01 -0600)
clang 4.0 warned about this.

ASTERISK-27635

Change-Id: I213f230607d7fbe97c0f5f2d60da9cbf5a2d8231

apps/app_voicemail.c

index 891b6f023ebee423e7a396d99d7d896ec59b5776..db6b75741b9ce9cca8cbbe65103aed59aacb7db1 100644 (file)
@@ -3482,7 +3482,7 @@ static struct vm_state *get_vm_state_by_imapuser(const char *user, int interacti
        if (interactive) {
                struct vm_state *vms;
                pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
-               if ((vms = pthread_getspecific(ts_vmstate.key)) && vms->imapuser && !strcmp(vms->imapuser, user)) {
+               if ((vms = pthread_getspecific(ts_vmstate.key)) && !strcmp(vms->imapuser, user)) {
                        return vms;
                }
        }
@@ -3496,10 +3496,6 @@ static struct vm_state *get_vm_state_by_imapuser(const char *user, int interacti
                if (vlist->vms->imapversion != imapversion) {
                        continue;
                }
-               if (!vlist->vms->imapuser) {
-                       ast_debug(3, "error: imapuser is NULL for %s\n", user);
-                       continue;
-               }
 
                if (!strcmp(vlist->vms->imapuser, user) && (interactive == 2 || vlist->vms->interactive == interactive)) {
                        AST_LIST_UNLOCK(&vmstates);
@@ -3522,7 +3518,7 @@ static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, const char
        if (interactive) {
                struct vm_state *vms;
                pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
-               if ((vms = pthread_getspecific(ts_vmstate.key)) && vms->username && vms->context &&
+               if ((vms = pthread_getspecific(ts_vmstate.key)) &&
                    !strcmp(vms->username,mailbox) && !strcmp(vms->context, local_context)) {
                        return vms;
                }
@@ -3537,10 +3533,6 @@ static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, const char
                if (vlist->vms->imapversion != imapversion) {
                        continue;
                }
-               if (!vlist->vms->username || !vlist->vms->context) {
-                       ast_debug(3, "error: username is NULL for %s\n", mailbox);
-                       continue;
-               }
 
                ast_debug(3, "comparing mailbox %s@%s (i=%d) to vmstate mailbox %s@%s (i=%d)\n", mailbox, local_context, interactive, vlist->vms->username, vlist->vms->context, vlist->vms->interactive);