Stop using deprecated method, as requested by Kevin.

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 97afbb2766c95abe8eac14b4a7fbb0370675c25e..2bf8bfd60ca2bae6e207f25e2d0d6b2bb26173bc 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1143,9 +1143,14 @@ static int retrieve_file(char *dir, int msgnum)
                                        truncate(full_fn, fdlen);
                                }
                        } else {
-                               res = SQLGetData(stmt, x + 1, SQL_CHAR, rowdata, sizeof(rowdata), NULL);
+                               SQLLEN ind;
+                               res = SQLGetData(stmt, x + 1, SQL_CHAR, rowdata, sizeof(rowdata), &ind);
                                if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
-                                       ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql);
+                                       SQLINTEGER nativeerror = 0;
+                                       SQLSMALLINT diagbytes = 0;
+                                       unsigned char state[10], diagnostic[256];
+                                       SQLGetDiagRec(SQL_HANDLE_STMT, stmt, 1, state, &nativeerror, diagnostic, sizeof(diagnostic), &diagbytes);
+                                       ast_log(LOG_WARNING, "SQL Get Data error: %s: %s!\n[%s]\n\n", state, diagnostic, sql);
                                        SQLFreeHandle (SQL_HANDLE_STMT, stmt);
                                        ast_odbc_release_obj(obj);
                                        goto yuck;
@@ -1329,23 +1334,85 @@ static void copy_file(char *sdir, int smsg, char *ddir, int dmsg, char *dmailbox
        return; 
 }
 
+struct insert_cb_struct {
+       char *dir;
+       char *msgnum;
+       void *recording;
+       size_t recordinglen;
+       SQLLEN indlen;
+       const char *context;
+       const char *macrocontext;
+       const char *callerid;
+       const char *origtime;
+       const char *duration;
+       char *mailboxuser;
+       char *mailboxcontext;
+       const char *category;
+       char *sql;
+};
+
+static SQLHSTMT insert_cb(struct odbc_obj *obj, void *vd)
+{
+       struct insert_cb_struct *d = vd;
+       int res;
+       SQLHSTMT stmt;
+
+       res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
+       if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+               ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
+               return NULL;
+       }
+
+       res = SQLPrepare(stmt, (unsigned char *)d->sql, SQL_NTS);
+       if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
+               ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", d->sql);
+               SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+               return NULL;
+       }
+
+       SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->dir), 0, (void *)d->dir, 0, NULL);
+       SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->msgnum), 0, (void *)d->msgnum, 0, NULL);
+       SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_LONGVARBINARY, d->recordinglen, 0, (void *)d->recording, 0, &d->indlen);
+       SQLBindParameter(stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->context), 0, (void *)d->context, 0, NULL);
+       SQLBindParameter(stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->macrocontext), 0, (void *)d->macrocontext, 0, NULL);
+       SQLBindParameter(stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->callerid), 0, (void *)d->callerid, 0, NULL);
+       SQLBindParameter(stmt, 7, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->origtime), 0, (void *)d->origtime, 0, NULL);
+       SQLBindParameter(stmt, 8, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->duration), 0, (void *)d->duration, 0, NULL);
+       SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->mailboxuser), 0, (void *)d->mailboxuser, 0, NULL);
+       SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->mailboxcontext), 0, (void *)d->mailboxcontext, 0, NULL);
+       if (!ast_strlen_zero(d->category)) {
+               SQLBindParameter(stmt, 11, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(d->category), 0, (void *)d->category, 0, NULL);
+       }
+
+       return stmt;
+}
+
 static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int msgnum)
 {
        int x = 0;
-       int res;
        int fd = -1;
        void *fdm = MAP_FAILED;
        size_t fdlen = -1;
        SQLHSTMT stmt;
-       SQLLEN len;
        char sql[PATH_MAX];
        char msgnums[20];
        char fn[PATH_MAX];
        char full_fn[PATH_MAX];
        char fmt[80]="";
        char *c;
-       const char *context="", *macrocontext="", *callerid="", *origtime="", *duration="";
-       const char *category = "";
+       struct insert_cb_struct d = {
+               .dir = dir,
+               .msgnum = msgnums,
+               .context = "",
+               .macrocontext = "",
+               .callerid = "",
+               .origtime = "",
+               .duration = "",
+               .mailboxuser = mailboxuser,
+               .mailboxcontext = mailboxcontext,
+               .category = "",
+               .sql = sql
+       };
        struct ast_config *cfg=NULL;
        struct odbc_obj *obj;
 
@@ -1373,66 +1440,38 @@ static int store_file(char *dir, char *mailboxuser, char *mailboxcontext, int ms
                        goto yuck;
                }
                if (cfg) {
-                       context = ast_variable_retrieve(cfg, "message", "context");
-                       if (!context) context = "";
-                       macrocontext = ast_variable_retrieve(cfg, "message", "macrocontext");
-                       if (!macrocontext) macrocontext = "";
-                       callerid = ast_variable_retrieve(cfg, "message", "callerid");
-                       if (!callerid) callerid = "";
-                       origtime = ast_variable_retrieve(cfg, "message", "origtime");
-                       if (!origtime) origtime = "";
-                       duration = ast_variable_retrieve(cfg, "message", "duration");
-                       if (!duration) duration = "";
-                       category = ast_variable_retrieve(cfg, "message", "category");
-                       if (!category) category = "";
+                       d.context = ast_variable_retrieve(cfg, "message", "context");
+                       if (!d.context) d.context = "";
+                       d.macrocontext = ast_variable_retrieve(cfg, "message", "macrocontext");
+                       if (!d.macrocontext) d.macrocontext = "";
+                       d.callerid = ast_variable_retrieve(cfg, "message", "callerid");
+                       if (!d.callerid) d.callerid = "";
+                       d.origtime = ast_variable_retrieve(cfg, "message", "origtime");
+                       if (!d.origtime) d.origtime = "";
+                       d.duration = ast_variable_retrieve(cfg, "message", "duration");
+                       if (!d.duration) d.duration = "";
+                       d.category = ast_variable_retrieve(cfg, "message", "category");
+                       if (!d.category) d.category = "";
                }
                fdlen = lseek(fd, 0, SEEK_END);
                lseek(fd, 0, SEEK_SET);
                printf("Length is %zd\n", fdlen);
-               fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED,fd, 0);
+               fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_32BIT, fd, 0);
                if (fdm == MAP_FAILED) {
                        ast_log(LOG_WARNING, "Memory map failed!\n");
                        ast_odbc_release_obj(obj);
                        goto yuck;
-               } 
-               res = SQLAllocHandle(SQL_HANDLE_STMT, obj->con, &stmt);
-               if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
-                       ast_log(LOG_WARNING, "SQL Alloc Handle failed!\n");
-                       ast_odbc_release_obj(obj);
-                       goto yuck;
                }
-               if (!ast_strlen_zero(category)) 
+               d.recording = fdm;
+               d.recordinglen = d.indlen = fdlen; /* SQL_LEN_DATA_AT_EXEC(fdlen); */
+               if (!ast_strlen_zero(d.category)) 
                        snprintf(sql, sizeof(sql), "INSERT INTO %s (dir,msgnum,recording,context,macrocontext,callerid,origtime,duration,mailboxuser,mailboxcontext,category) VALUES (?,?,?,?,?,?,?,?,?,?,?)",odbc_table); 
                else
-                       snprintf(sql, sizeof(sql), "INSERT INTO %s (dir,msgnum,recording,context,macrocontext,callerid,origtime,duration,mailboxuser,mailboxcontext) VALUES (?,?,?,?,?,?,?,?,?,?)",odbc_table);
-               res = SQLPrepare(stmt, (unsigned char *)sql, SQL_NTS);
-               if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
-                       ast_log(LOG_WARNING, "SQL Prepare failed![%s]\n", sql);
-                       SQLFreeHandle (SQL_HANDLE_STMT, stmt);
-                       ast_odbc_release_obj(obj);
-                       goto yuck;
-               }
-               len = fdlen; /* SQL_LEN_DATA_AT_EXEC(fdlen); */
-               SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(dir), 0, (void *)dir, 0, NULL);
-               SQLBindParameter(stmt, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(msgnums), 0, (void *)msgnums, 0, NULL);
-               SQLBindParameter(stmt, 3, SQL_PARAM_INPUT, SQL_C_BINARY, SQL_LONGVARBINARY, fdlen, 0, (void *)fdm, fdlen, &len);
-               SQLBindParameter(stmt, 4, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(context), 0, (void *)context, 0, NULL);
-               SQLBindParameter(stmt, 5, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(macrocontext), 0, (void *)macrocontext, 0, NULL);
-               SQLBindParameter(stmt, 6, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(callerid), 0, (void *)callerid, 0, NULL);
-               SQLBindParameter(stmt, 7, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(origtime), 0, (void *)origtime, 0, NULL);
-               SQLBindParameter(stmt, 8, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(duration), 0, (void *)duration, 0, NULL);
-               SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(mailboxuser), 0, (void *)mailboxuser, 0, NULL);
-               SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(mailboxcontext), 0, (void *)mailboxcontext, 0, NULL);
-               if (!ast_strlen_zero(category))
-                       SQLBindParameter(stmt, 11, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(category), 0, (void *)category, 0, NULL);
-               res = ast_odbc_smart_execute(obj, stmt);
-               if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
-                       ast_log(LOG_WARNING, "SQL Execute error!\n[%s]\n\n", sql);
-                       SQLFreeHandle (SQL_HANDLE_STMT, stmt);
-                       ast_odbc_release_obj(obj);
-                       goto yuck;
+                       snprintf(sql, sizeof(sql), "INSERT INTO %s (dir,msgnum,recording,context,macrocontext,callerid,origtime,duration,mailboxuser,mailboxcontext) VALUES (?,?, ? , ?,?,?,?,?,?,?)",odbc_table);
+               stmt = ast_odbc_prepare_and_execute(obj, insert_cb, &d);
+               if (stmt) {
+                       SQLFreeHandle(SQL_HANDLE_STMT, stmt);
                }
-               SQLFreeHandle (SQL_HANDLE_STMT, stmt);
                ast_odbc_release_obj(obj);
        } else
                ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database);