[asterisk-commits] kpfleming: branch 1.4 r61070 - in /branches/1.4: main/minimime/ res/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Mon Apr  9 14:55:14 2007
New Revision: 61070

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61070
Log:
fix up some warnings found using --enable-dev-mode

Modified:
    branches/1.4/main/minimime/mm_envelope.c
    branches/1.4/res/res_features.c

Modified: branches/1.4/main/minimime/mm_envelope.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/minimime/mm_envelope.c?view=diff&rev=61070&r1=61069&r2=61070
==============================================================================
--- branches/1.4/main/minimime/mm_envelope.c (original)
+++ branches/1.4/main/minimime/mm_envelope.c Mon Apr  9 14:55:14 2007
@@ -240,7 +240,7 @@
 {
 	struct mm_mimepart *part;
 	struct mm_mimeheader *to, *cc;
-	size_t recipients_length;
+	size_t recipients_length = 0;
 
 	part = mm_context_getpart(ctx, 0);
 	if (part == NULL) {

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=61070&r1=61069&r2=61070
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Mon Apr  9 14:55:14 2007
@@ -1436,13 +1436,6 @@
 		}
 		if (res < 0) {
 			ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name);
-			/* whoa!! don't go running off without cleaning up your mess! */
-			if (bridge_cdr) {
-				ast_cdr_failed(bridge_cdr);
-				ast_cdr_end(bridge_cdr);
-				ast_cdr_detach(bridge_cdr);
-				bridge_cdr = NULL;
-			}
 			chan->cdr = NULL;
 			peer->cdr = NULL;
 			return -1;
@@ -1535,6 +1528,7 @@
 			ast_frfree(f);
 
 	}
+
 	/* arrange the cdrs */
 	bridge_cdr = ast_cdr_alloc();
 	if (bridge_cdr) {