[asterisk-commits] tilghman: trunk r68782 - in /trunk: ./ apps/app_directory.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Mon Jun 11 15:51:43 2007
New Revision: 68782

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68782
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_directory.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_directory.c?view=diff&rev=68782&r1=68781&r2=68782
==============================================================================
--- trunk/apps/app_directory.c (original)
+++ trunk/apps/app_directory.c Mon Jun 11 15:51:43 2007
@@ -265,9 +265,6 @@
 	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 @@
 			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 @@
 	}
 #ifdef ODBC_STORAGE
 	ast_filedelete(fn, NULL);	
-	ast_filedelete(fn2, NULL);	
 #endif
 
 	for (loop = 3 ; loop > 0; loop--) {