diff options
| author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-27 19:31:54 +0000 |
|---|---|---|
| committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-27 19:31:54 +0000 |
| commit | 7f2b0a39ea4bb48a13955fb3737b821ff4b0a1a5 (patch) | |
| tree | 2db53aac89642dfbf8abe1d2a765fd76bc17106f /res/res_musiconhold.c | |
| parent | 33cdd88430f3166291238739ecbb0759f417d48d (diff) | |
Janitor work converting !ast_strlen_zero(a)?a:b
to S_OR functions. from bug note 6805 with minor
modifications.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@15283 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index bca584db0..289d139d0 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1127,10 +1127,10 @@ static int moh_classes_show(int fd, int argc, char *argv[]) ast_mutex_lock(&moh_lock); for (class = mohclasses; class; class = class->next) { ast_cli(fd, "Class: %s\n", class->name); - ast_cli(fd, "\tMode: %s\n", ast_strlen_zero(class->mode) ? "<none>" : class->mode); - ast_cli(fd, "\tDirectory: %s\n", ast_strlen_zero(class->dir) ? "<none>" : class->dir); + ast_cli(fd, "\tMode: %s\n", S_OR(class->mode,"<none>")); + ast_cli(fd, "\tDirectory: %s\n", S_OR(class->dir, "<none>")); if (ast_test_flag(class, MOH_CUSTOM)) - ast_cli(fd, "\tApplication: %s\n", ast_strlen_zero(class->args) ? "<none>" : class->args); + ast_cli(fd, "\tApplication: %s\n", S_OR(class->args, "<none>")); ast_cli(fd, "\tFormat: %s\n", ast_getformatname(class->format)); } ast_mutex_unlock(&moh_lock); |