Merged revisions 68781 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 11 Jun 2007 20:51:43 +0000 (20:51 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 11 Jun 2007 20:51:43 +0000 (20:51 +0000)
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

apps/app_directory.c

index 0346d64..a53cd74 100644 (file)
@@ -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--) {