From a5ece3388a82dcd27ee7d234891079709f6bea5b Mon Sep 17 00:00:00 2001 From: Matt O'Gorman Date: Mon, 27 Mar 2006 19:31:54 +0000 Subject: Janitor work converting !ast_strlen_zero(a)?a:b to S_OR functions. from bug note 6805 with minor modifications. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15283 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'res/res_musiconhold.c') 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) ? "" : class->mode); - ast_cli(fd, "\tDirectory: %s\n", ast_strlen_zero(class->dir) ? "" : class->dir); + ast_cli(fd, "\tMode: %s\n", S_OR(class->mode,"")); + ast_cli(fd, "\tDirectory: %s\n", S_OR(class->dir, "")); if (ast_test_flag(class, MOH_CUSTOM)) - ast_cli(fd, "\tApplication: %s\n", ast_strlen_zero(class->args) ? "" : class->args); + ast_cli(fd, "\tApplication: %s\n", S_OR(class->args, "")); ast_cli(fd, "\tFormat: %s\n", ast_getformatname(class->format)); } ast_mutex_unlock(&moh_lock); -- cgit v1.2.3