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 e94bc475dfce3ee4371cc617a9b516d2784ac5ad..56449043105c629bd87dd656749512338a5430f8 100644 (file)
--- 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 3fe30e8dbefedf90a22407bd1459e4038b5f80b2..16139c43fc431f389fc68ac85809119248c3f492 100644 (file)
--- 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) {