diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-05 14:09:24 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-05 14:09:24 +0000 |
commit | b2e008a37202ebc872f602e7b343fcc60512b683 (patch) | |
tree | c6db38f2a7eb92ea02738c3425d53acc663e9c9e /main/file.c | |
parent | c32b8a190f505987e1773afdc4428309efb77310 (diff) |
Revert some silly code that snuck into trunk from my working copy. Sorry!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@210522 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
-rw-r--r-- | main/file.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/main/file.c b/main/file.c index 21ce1bbdc..c89cee97c 100644 --- a/main/file.c +++ b/main/file.c @@ -320,7 +320,6 @@ static void filestream_destructor(void *arg) free(f->filename); if (f->realfilename) free(f->realfilename); - ast_free(f->open_filename); if (f->fmt->close) { void (*closefn)(struct ast_filestream *) = f->fmt->close; closefn(f); @@ -473,7 +472,6 @@ static int ast_filehelper(const char *filename, const void *arg2, const char *fm s->fmt = f; s->trans = NULL; s->filename = NULL; - s->open_filename = ast_strdup(fn);; if (s->fmt->format & AST_FORMAT_AUDIO_MASK) { if (chan->stream) ast_closestream(chan->stream); @@ -828,30 +826,7 @@ static int ast_fsread_video(const void *data) int ast_applystream(struct ast_channel *chan, struct ast_filestream *s) { - struct ast_party_connected_line connected; - char *fn; - - ast_channel_lock(chan); - ast_party_connected_line_set_init(&connected, &chan->connected); - if (ast_strlen_zero(chan->connected.id.number)) { - connected.id.number = ast_strdupa(chan->exten); - } - ast_channel_unlock(chan); - - fn = ast_strdupa(s->open_filename); - if ((fn = strrchr(fn, '/'))) { - char *dot; - *fn++ = '\0'; - if ((dot = strrchr(fn, '.'))) { - *dot = '\0'; - } - } - connected.id.number = connected.id.name = fn; - - ast_channel_update_connected_line(chan, &connected); - s->owner = chan; - return 0; } |