diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 19:55:14 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 19:55:14 +0000 |
| commit | a5f3ecd144b3c41abc8ae07b39d26bcfb9fab015 (patch) | |
| tree | ea0d6231f17193ba05e7c2a644dea99df995a5f4 | |
| parent | 14515620c32c27861bcfdea369267269afa6c426 (diff) | |
fix up some warnings found using --enable-dev-mode
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@61070 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/minimime/mm_envelope.c | 2 | ||||
| -rw-r--r-- | res/res_features.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/main/minimime/mm_envelope.c b/main/minimime/mm_envelope.c index e94bc475d..564490431 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 3fe30e8db..16139c43f 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) { |