conversions to S_OR (issue #6803)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@15022 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 4 deletions

diff --git a/manager.c b/manager.c
index 47badecac..b3d293fef 100644
--- a/manager.c
+++ b/manager.c
@@ -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);
 	}