diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
| commit | 38236e54a84c61194c30c92b923752f0dc816d57 (patch) | |
| tree | b27d3b73accfe81703eb5f706d1447a661986f5e /main/cdr.c | |
| parent | 63a229e3695514bbb15cd5ee4674b6b5bb580f0b (diff) | |
Remove dead code from features.c; refactor pickup code into pickup.c
This patch does the following:
* It moves the pickup code out of features.c and into pickup.c
* It removes the vast majority of dead code out of features.c. In particular,
this includes the parking code.
(issue ASTERISK-22134)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cdr.c')
| -rw-r--r-- | main/cdr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/main/cdr.c b/main/cdr.c index f3608f0a9..8b4d0ba05 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -916,17 +916,14 @@ static int snapshot_cep_changed(struct ast_channel_snapshot *old_snapshot, return 0; } - if (strcmp(new_snapshot->context, old_snapshot->context) - || strcmp(new_snapshot->exten, old_snapshot->exten) - || new_snapshot->priority != old_snapshot->priority) { - return 1; - } - /* When Party A is originated to an application and the application exits, the stack * will attempt to clear the application and restore the dummy originate application * of "AppDialX". Ignore application changes to AppDialX as a result. */ - if (strcmp(new_snapshot->appl, old_snapshot->appl) && strncasecmp(new_snapshot->appl, "appdial", 7)) { + if (strcmp(new_snapshot->appl, old_snapshot->appl) && strncasecmp(new_snapshot->appl, "appdial", 7) + && (strcmp(new_snapshot->context, old_snapshot->context) + || strcmp(new_snapshot->exten, old_snapshot->exten) + || new_snapshot->priority != old_snapshot->priority)) { return 1; } |