diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-02-01 12:04:06 -0700 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-02-01 19:22:40 -0600 |
| commit | 40da6434c1189e2557d20ea3871761cb34595257 (patch) | |
| tree | 5337e33a26badb1830c26153a87186e7d1bcecaa /apps/app_minivm.c | |
| parent | 52b29f9b4cd373be7357cd03e01cfeb2d0029140 (diff) | |
build_system: Fix some warnings highlighted by clang
Fix some warnings found with clang.
Change-Id: I5195b6189b148c2ee3ed4a19d015a6d4ef3e77bd
Diffstat (limited to 'apps/app_minivm.c')
| -rw-r--r-- | apps/app_minivm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 4b1c4b575..e97150b13 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -2998,10 +2998,10 @@ static char *handle_minivm_list_templates(struct ast_cli_entry *e, int cmd, stru ast_cli(a->fd, HVLT_OUTPUT_FORMAT, "-------------", "-------", "------", "------------", "-------"); AST_LIST_TRAVERSE(&message_templates, this, list) { ast_cli(a->fd, HVLT_OUTPUT_FORMAT, this->name, - this->charset ? this->charset : "-", - this->locale ? this->locale : "-", + S_OR(this->charset, "-"), + S_OR(this->locale, "-"), this->attachment ? "Yes" : "No", - this->subject ? this->subject : "-"); + S_OR(this->subject, "-")); count++; } AST_LIST_UNLOCK(&message_templates); @@ -3069,10 +3069,10 @@ static char *handle_minivm_show_users(struct ast_cli_entry *e, int cmd, struct a if ((a->argc == 3) || ((a->argc == 5) && !strcmp(a->argv[4], vmu->domain))) { count++; snprintf(tmp, sizeof(tmp), "%s@%s", vmu->username, vmu->domain); - ast_cli(a->fd, HMSU_OUTPUT_FORMAT, tmp, vmu->etemplate ? vmu->etemplate : "-", - vmu->ptemplate ? vmu->ptemplate : "-", - vmu->zonetag ? vmu->zonetag : "-", - vmu->attachfmt ? vmu->attachfmt : "-", + ast_cli(a->fd, HMSU_OUTPUT_FORMAT, tmp, S_OR(vmu->etemplate, "-"), + S_OR(vmu->ptemplate, "-"), + S_OR(vmu->zonetag, "-"), + S_OR(vmu->attachfmt, "-"), vmu->fullname); } } |