aboutsummaryrefslogtreecommitdiffstats
path: root/main/file.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-09 04:31:38 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-09 04:31:38 +0000
commitc23a82df3d893f525a52da48a638fcf30dd51abe (patch)
tree8833bc6f89dc013402311310e901f6db1e7430d6 /main/file.c
parentb4d44bd078c4c4988f0b406923bd47eeb6bc0230 (diff)
Add debugging mode for diagnosing file descriptor leaks.
(Related to issue #14625) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@187300 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
-rw-r--r--main/file.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/main/file.c b/main/file.c
index faca5a9be..8e8388014 100644
--- a/main/file.c
+++ b/main/file.c
@@ -332,8 +332,10 @@ static void filestream_destructor(void *arg)
free(f->filename);
if (f->realfilename)
free(f->realfilename);
- if (f->fmt->close)
- f->fmt->close(f);
+ if (f->fmt->close) {
+ void (*closefn)(struct ast_filestream *) = f->fmt->close;
+ closefn(f);
+ }
if (f->f)
fclose(f->f);
if (f->vfs)
@@ -371,8 +373,9 @@ static int fn_wrapper(struct ast_filestream *s, const char *comment, enum wrap_f
{
struct ast_format *f = s->fmt;
int ret = -1;
+ int (*openfn)(struct ast_filestream *s);
- if (mode == WRAP_OPEN && f->open && f->open(s))
+ if (mode == WRAP_OPEN && (openfn = f->open) && openfn(s))
ast_log(LOG_WARNING, "Unable to open format %s\n", f->name);
else if (mode == WRAP_REWRITE && f->rewrite && f->rewrite(s, comment))
ast_log(LOG_WARNING, "Unable to rewrite format %s\n", f->name);