From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 11 Jun 2007 20:51:43 +0000 (+0000)
Subject: Merged revisions 68781 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b353c43c28a86f7a65dbad1a756eb33f50fc6167;p=thirdparty%2Fasterisk.git

Merged revisions 68781 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68781 | tilghman | 2007-06-11 15:45:53 -0500 (Mon, 11 Jun 2007) | 2 lines

Issue 9947 - fn2 was unused / incorrectly used

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_directory.c b/apps/app_directory.c
index 0346d64522..a53cd74060 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -265,9 +265,6 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context,
 	int res = 0;
 	int loop;
 	char fn[256];
-#ifdef ODBC_STORAGE
-	char fn2[256];
-#endif
 
 	/* Check for the VoiceMail2 greeting first */
 	snprintf(fn, sizeof(fn), "%s/voicemail/%s/%s/greet",
@@ -282,7 +279,7 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context,
 			ast_config_AST_SPOOL_DIR, ext);
 	}
 #ifdef ODBC_STORAGE
-	retrieve_file(fn2);
+	retrieve_file(fn);
 #endif
 
 	if (ast_fileexists(fn, NULL, chan->language) > 0) {
@@ -302,7 +299,6 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context,
 	}
 #ifdef ODBC_STORAGE
 	ast_filedelete(fn, NULL);	
-	ast_filedelete(fn2, NULL);	
 #endif
 
 	for (loop = 3 ; loop > 0; loop--) {