diff options
| author | Olle Johansson <oej@edvina.net> | 2006-01-04 21:52:35 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-01-04 21:52:35 +0000 |
| commit | 223c0c303a25fa0fa4dc7f81d233f6ce46380098 (patch) | |
| tree | e96034166156b6b1da400a3fd3658192054471dc | |
| parent | a14916bfa5a625b3582f759392e5aa6783620a22 (diff) | |
Merged revisions 7795 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7795 | oej | 2006-01-04 22:46:40 +0100 (Wed, 04 Jan 2006) | 2 lines
Issue #5980: Removing extra CR+LF in manager events - needs port to trunk
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/res_features.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_features.c b/res/res_features.c index f0d8ab9f7..b628a035d 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -358,7 +358,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou "From: %s\r\n" "Timeout: %ld\r\n" "CallerID: %s\r\n" - "CallerIDName: %s\r\n\r\n" + "CallerIDName: %s\r\n" ,pu->parkingnum, pu->chan->name, peer->name ,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL) ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>") @@ -1544,7 +1544,7 @@ static void *do_parking_thread(void *ignore) "Exten: %d\r\n" "Channel: %s\r\n" "CallerID: %s\r\n" - "CallerIDName: %s\r\n\r\n" + "CallerIDName: %s\r\n" ,pu->parkingnum, pu->chan->name ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>") ,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>") @@ -1588,7 +1588,7 @@ static void *do_parking_thread(void *ignore) "Exten: %d\r\n" "Channel: %s\r\n" "CallerID: %s\r\n" - "CallerIDName: %s\r\n\r\n" + "CallerIDName: %s\r\n" ,pu->parkingnum, pu->chan->name ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>") ,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>") @@ -1725,7 +1725,7 @@ static int park_exec(struct ast_channel *chan, void *data) "Channel: %s\r\n" "From: %s\r\n" "CallerID: %s\r\n" - "CallerIDName: %s\r\n\r\n" + "CallerIDName: %s\r\n" ,pu->parkingnum, pu->chan->name, chan->name ,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>") ,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>") |