[svn-commits] russell: trunk r210522 - /trunk/main/file.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Aug  5 09:09:24 2009
New Revision: 210522

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=210522
Log:
Revert some silly code that snuck into trunk from my working copy.  Sorry!

Modified:
    trunk/main/file.c

Modified: trunk/main/file.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/file.c?view=diff&rev=210522&r1=210521&r2=210522
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Wed Aug  5 09:09:24 2009
@@ -320,7 +320,6 @@
 		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 @@
 				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 @@
 
 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;
 }