diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-03-26 16:08:42 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-03-26 16:08:42 +0000 |
commit | d0b003a4270a7b8510fcbdc5c398fe579f33f966 (patch) | |
tree | 880df416b5aedc4abef8b1c75e85b0d5ac72e04e /manager.c | |
parent | eaeb8abc59db5f87f5866b87833cfc6260303f3a (diff) |
conversions to S_OR (issue #6803)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15022 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'manager.c')
-rw-r--r-- | manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -998,13 +998,13 @@ static void *fast_originate(void *data) if (!ast_strlen_zero(in->app)) { res = ast_pbx_outgoing_app(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->app, in->appdata, &reason, 1, - !ast_strlen_zero(in->cid_num) ? in->cid_num : NULL, - !ast_strlen_zero(in->cid_name) ? in->cid_name : NULL, + S_OR(in->cid_num, NULL), + S_OR(in->cid_name, NULL), in->vars, in->account, &chan); } else { res = ast_pbx_outgoing_exten(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->context, in->exten, in->priority, &reason, 1, - !ast_strlen_zero(in->cid_num) ? in->cid_num : NULL, - !ast_strlen_zero(in->cid_name) ? in->cid_name : NULL, + S_OR(in->cid_num, NULL), + S_OR(in->cid_name, NULL), in->vars, in->account, &chan); } |