From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 1 Mar 2010 18:39:11 +0000 (+0000)
Subject: Merged revisions 249623 via svnmerge from
X-Git-Tag: 1.6.1.18-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f85fc212b61d946c3dad96b8db34652f45bb754;p=thirdparty%2Fasterisk.git

Merged revisions 249623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r249623 | tilghman | 2010-03-01 12:36:06 -0600 (Mon, 01 Mar 2010) | 2 lines

  Constify a bit of app_voicemail, to make ODBC and IMAP compile once again.
........


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1bf8c7700e..4d07325fe9 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -162,7 +162,7 @@ static int save_body(BODY *body, struct vm_state *vms, char *section, char *form
 static void get_mailbox_delimiter(MAILSTREAM *stream);
 static void mm_parsequota (MAILSTREAM *stream, unsigned char *msg, QUOTALIST *pquota);
 static void imap_mailbox_name(char *spec, size_t len, struct vm_state *vms, int box, int target);
-static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, int msgnum, struct ast_channel *chan, struct ast_vm_user *vmu, char *fmt, int duration, struct vm_state *vms, const char *flag);
+static int imap_store_file(const char *dir, const char *mailboxuser, const char *mailboxcontext, int msgnum, struct ast_channel *chan, struct ast_vm_user *vmu, char *fmt, int duration, struct vm_state *vms, const char *flag);
 static void update_messages_by_imapuser(const char *user, unsigned long number);
 static int vm_delete(char *file);
 
@@ -1823,7 +1823,7 @@ static int messagecount(const char *context, const char *mailbox, const char *fo
 	}
 }
 
-static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, int msgnum, struct ast_channel *chan, struct ast_vm_user *vmu, char *fmt, int duration, struct vm_state *vms, const char *flag)
+static int imap_store_file(const char *dir, const char *mailboxuser, const char *mailboxcontext, int msgnum, struct ast_channel *chan, struct ast_vm_user *vmu, char *fmt, int duration, struct vm_state *vms, const char *flag)
 {
 	char *myserveremail = serveremail;
 	char fn[PATH_MAX];
@@ -3186,15 +3186,17 @@ static int count_messages(struct ast_vm_user *vmu, char *dir)
  * 
  * \return the value greater than zero on success to indicate the number of messages, less than zero on error.
  */
-static void delete_file(char *sdir, int smsg)
+static void delete_file(const char *sdir, int smsg)
 {
 	SQLHSTMT stmt;
 	char sql[PATH_MAX];
 	char msgnums[20];
-	char *argv[] = { sdir, msgnums };
+	char *argv[] = { NULL, msgnums };
 	struct generic_prepare_struct gps = { .sql = sql, .argc = 2, .argv = argv };
-
 	struct odbc_obj *obj;
+
+	argv[0] = ast_strdupa(sdir);
+
 	obj = ast_odbc_request_obj(odbc_database, 0);
 	if (obj) {
 		snprintf(msgnums, sizeof(msgnums), "%d", smsg);
@@ -3250,8 +3252,8 @@ static void copy_file(char *sdir, int smsg, char *ddir, int dmsg, char *dmailbox
 
 struct insert_data {
 	char *sql;
-	char *dir;
-	char *msgnums;
+	const char *dir;
+	const char *msgnums;
 	void *data;
 	SQLLEN datalen;
 	SQLLEN indlen;
@@ -3260,8 +3262,8 @@ struct insert_data {
 	const char *callerid;
 	const char *origtime;
 	const char *duration;
-	char *mailboxuser;
-	char *mailboxcontext;
+	const char *mailboxuser;
+	const char *mailboxcontext;
 	const char *category;
 	const char *flag;
 };
@@ -3316,7 +3318,7 @@ static SQLHSTMT insert_data_cb(struct odbc_obj *obj, void *vdata)
  *
  * \return the zero on success -1 on error.
  */
-static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int msgnum)
+static int store_file(const char *dir, const char *mailboxuser, const char *mailboxcontext, int msgnum)
 {
 	int res = 0;
 	int fd = -1;