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 18:20:05 -0700 |
| commit | 8804d0973c9144da4b3af863a24a8dfaac22c04e (patch) | |
| tree | 0662c58f11d7483f7980a116b225c6443c40c639 /apps | |
| parent | 109b0aff6bcd73a634f440b6c8ec84a155e4ba66 (diff) | |
build_system: Fix some warnings highlighted by clang
Fix some warnings found with clang.
Change-Id: I5195b6189b148c2ee3ed4a19d015a6d4ef3e77bd
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_fax.c | 4 | ||||
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | apps/app_minivm.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/app_fax.c b/apps/app_fax.c index 7822a34e8..88aa6ad1a 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -356,8 +356,8 @@ static int fax_generator_generate(struct ast_channel *chan, void *data, int len, } static struct ast_generator generator = { - alloc: fax_generator_alloc, - generate: fax_generator_generate, + .alloc = fax_generator_alloc, + .generate = fax_generator_generate, }; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index b2131ff7e..7903b1d5f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2936,7 +2936,7 @@ static void meetme_menu_admin(enum menu_modes *menu_mode, int *dtmf, struct ast_ tweak_talk_volume(user, VOL_UP); break; default: - menu_mode = MENU_DISABLED; + *menu_mode = MENU_DISABLED; /* Play an error message! */ if (!ast_streamfile(chan, "conf-errormenu", ast_channel_language(chan))) { ast_waitstream(chan, ""); diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 45d04d8ba..fb7c22aa4 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); } } |