Kevin suggested doing the reverse of my last commit, since imap_retrieve_file

does not modify the contents of the "mailbox" string. In other words, I'm changing
the imap_retrieve_file function to take a const char* as the third argument so that I
don't need to cast const char*'s as char*'s to suppress compiler warnings.

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index f2cda82f8112ed65805d7a7463e061d6410086c6..7e4045d3a96cd86be85c3c2880d4f3a080b42823 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -148,7 +148,7 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i
 static void update_messages_by_imapuser(const char *user, unsigned long number);
 
 static int imap_remove_file (char *dir, int msgnum);
-static int imap_retrieve_file (char *dir, int msgnum, char *mailbox, char *context);
+static int imap_retrieve_file (char *dir, int msgnum, const char *mailbox, char *context);
 static int imap_delete_old_greeting (char *dir, struct vm_state *vms);
 struct vmstate {
        struct vm_state *vms;
@@ -4283,7 +4283,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
 
                        /* play name if available, else play extension number */
                        snprintf(fn, sizeof(fn), "%s%s/%s/greet", VM_SPOOL_DIR, receiver->context, s);
-                       RETRIEVE(fn, -1, (char *)s, receiver->context);
+                       RETRIEVE(fn, -1, s, receiver->context);
                        if (ast_fileexists(fn, NULL, NULL) > 0) {
                                res = ast_stream_and_wait(chan, fn, ecodes);
                                if (res) {