[svn-commits] mvanbaak: branch 1.6.0 r131014 - in /branches/1.6.0: ./ main/cdr.c

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Tue Jul 15 13:00:24 2008
New Revision: 131014

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131014
Log:
Merged revisions 131013 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r131013 | mvanbaak | 2008-07-15 19:49:48 +0200 (Tue, 15 Jul 2008) | 15 lines

Merged revisions 131012 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r131012 | mvanbaak | 2008-07-15 19:47:15 +0200 (Tue, 15 Jul 2008) | 7 lines

remove 4 lines of redundant code.

(closes issue #13080)
Reported by: gknispel_proformatique
Patches:
      trunk_ast_cdr_setapp.patch uploaded by gknispel (license 261)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/cdr.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/cdr.c?view=diff&rev=131014&r1=131013&r2=131014
==============================================================================
--- branches/1.6.0/main/cdr.c (original)
+++ branches/1.6.0/main/cdr.c Tue Jul 15 13:00:24 2008
@@ -781,10 +781,6 @@
 	for (; cdr; cdr = cdr->next) {
 		if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED)) {
 			check_post(cdr);
-			if (!app)
-				app = "";
-			if (!data)
-				data = "";
 			ast_copy_string(cdr->lastapp, S_OR(app, ""), sizeof(cdr->lastapp));
 			ast_copy_string(cdr->lastdata, S_OR(data, ""), sizeof(cdr->lastdata));
 		}