diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_directory.c | 3 | ||||
| -rw-r--r-- | apps/app_queue.c | 2 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index bbca1bf62..ce01bc83b 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -475,7 +475,8 @@ static struct ast_config *realtime_directory(char *context) const char *ctx = ast_variable_retrieve(rtdata, mailbox, "context"); fullname = ast_variable_retrieve(rtdata, mailbox, "fullname"); - if (ast_true((hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir")))) { + hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir"); + if (ast_true(hidefromdir)) { /* Skip hidden */ continue; } diff --git a/apps/app_queue.c b/apps/app_queue.c index 16967985d..245b45173 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2502,7 +2502,7 @@ static struct call_queue *find_queue_by_name_rt(const char *queuename, struct as memset(tmpbuf, 0, sizeof(tmpbuf)); for (v = queue_vars; v; v = v->next) { /* Convert to dashes `-' from underscores `_' as the latter are more SQL friendly. */ - if ((tmp = strchr(v->name, '_'))) { + if (strchr(v->name, '_')) { ast_copy_string(tmpbuf, v->name, sizeof(tmpbuf)); tmp_name = tmpbuf; tmp = tmpbuf; diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 39d284725..8ee8367e2 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1740,7 +1740,7 @@ static void vm_change_password(struct ast_vm_user *vmu, const char *newpassword) for (category = ast_category_browse(cfg, NULL); category; category = ast_category_browse(cfg, category)) { ast_debug(4, "users.conf: %s\n", category); if (!strcasecmp(category, vmu->mailbox)) { - if (!(tmp = ast_variable_retrieve(cfg, category, "vmsecret"))) { + if (!ast_variable_retrieve(cfg, category, "vmsecret")) { ast_debug(3, "looks like we need to make vmsecret!\n"); var = ast_variable_new("vmsecret", newpassword, ""); } else { |