From: Kevin P. Fleming <kpfleming@digium.com>
Date: Mon, 9 Apr 2007 19:55:14 +0000 (+0000)
Subject: fix up some warnings found using --enable-dev-mode
X-Git-Tag: 1.4.7.1~450
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf4969f66e0253cb8ba0ea03daf80b40ee1400cf;p=thirdparty%2Fasterisk.git

fix up some warnings found using --enable-dev-mode


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/minimime/mm_envelope.c b/main/minimime/mm_envelope.c
index e94bc475df..5644904310 100644
--- a/main/minimime/mm_envelope.c
+++ b/main/minimime/mm_envelope.c
@@ -240,7 +240,7 @@ mm_envelope_getrecipients(MM_CTX *ctx, char **result, size_t *length)
 {
 	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) {
diff --git a/res/res_features.c b/res/res_features.c
index 3fe30e8dbe..16139c43fc 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1436,13 +1436,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 		}
 		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 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 			ast_frfree(f);
 
 	}
+
 	/* arrange the cdrs */
 	bridge_cdr = ast_cdr_alloc();
 	if (bridge_cdr) {