Merged revisions 11503 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r11503 | tilghman | 2006-03-01 11:41:52 -0600 (Wed, 01 Mar 2006) | 2 lines

Bug 6615 - Fix 64bit conversion errors by using a long int

........

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

diff --git a/cdr.c b/cdr.c
index 3a1d53a6cbbb607305a4b3350aac642bd41ca3c2..ce908d82fd78c80bc202970fd9b873520eafd916 100644 (file)
--- a/cdr.c
+++ b/cdr.c
@@ -263,18 +263,18 @@ void ast_cdr_getvar(struct ast_cdr *cdr, const char *name, char **ret, char *wor
                        }
                }
        } else if (!strcasecmp(name, "duration"))
-               snprintf(workspace, workspacelen, "%d", cdr->duration);
+               snprintf(workspace, workspacelen, "%ld", cdr->duration);
        else if (!strcasecmp(name, "billsec"))
-               snprintf(workspace, workspacelen, "%d", cdr->billsec);
+               snprintf(workspace, workspacelen, "%ld", cdr->billsec);
        else if (!strcasecmp(name, "disposition")) {
                if (raw) {
-                       snprintf(workspace, workspacelen, "%d", cdr->disposition);
+                       snprintf(workspace, workspacelen, "%ld", cdr->disposition);
                } else {
                        ast_copy_string(workspace, ast_cdr_disp2str(cdr->disposition), workspacelen);
                }
        } else if (!strcasecmp(name, "amaflags")) {
                if (raw) {
-                       snprintf(workspace, workspacelen, "%d", cdr->amaflags);
+                       snprintf(workspace, workspacelen, "%ld", cdr->amaflags);
                } else {
                        ast_copy_string(workspace, ast_cdr_flags2str(cdr->amaflags), workspacelen);
                }

diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index e914772a28d0f3c8dc5b5d32d62b7666fc91d8e9..cd43c12beab4b77bf5eab5b75d0fdc805055d218 100644 (file)
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -121,8 +121,8 @@ static int manager_log(struct ast_cdr *cdr)
            "StartTime: %s\r\n"
            "AnswerTime: %s\r\n"
            "EndTime: %s\r\n"
-           "Duration: %d\r\n"
-           "BillableSeconds: %d\r\n"
+           "Duration: %ld\r\n"
+           "BillableSeconds: %ld\r\n"
            "Disposition: %s\r\n"
            "AMAFlags: %s\r\n"
            "UniqueID: %s\r\n"

diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index 2f78c99bbd7e46ad5b67f9c3ff5a81dd992761c9..f9a46c1f32b779c10f6ef82b379350b4f76a4c90 100644 (file)
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -122,7 +122,7 @@ static int odbc_log(struct ast_cdr *cdr)
        if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
                if (option_verbose > 10)
                        ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Failure in AllocStatement %d\n", ODBC_res);
-               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
                SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);      
                connected = 0;
                ast_mutex_unlock(&odbc_lock);
@@ -133,12 +133,12 @@ static int odbc_log(struct ast_cdr *cdr)
           strange reason if I don't it blows holes in memory like
           like a shotgun.  So we just do this so its safe. */
 
-       ODBC_res = SQLPrepare(ODBC_stmt, sqlcmd, SQL_NTS);
+       ODBC_res = SQLPrepare(ODBC_stmt, (unsigned char *)sqlcmd, SQL_NTS);
        
        if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
                if (option_verbose > 10)
                        ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in PREPARE %d\n", ODBC_res);
-               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
                SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
                connected = 0;
                ast_mutex_unlock(&odbc_lock);
@@ -381,7 +381,7 @@ static int odbc_do_query(void)
        if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
                if (option_verbose > 10)
                        ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error in Query %d\n", ODBC_res);
-               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
                SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt);
                connected = 0;
                return -1;
@@ -438,7 +438,7 @@ static int odbc_init(void)
        if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) {
                if (option_verbose > 10)
                        ast_verbose( VERBOSE_PREFIX_4 "cdr_odbc: Error SQLConnect %d\n", ODBC_res);
-               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, ODBC_stat, &ODBC_err, ODBC_msg, 100, &ODBC_mlen);
+               SQLGetDiagRec(SQL_HANDLE_DBC, ODBC_con, 1, (unsigned char *)ODBC_stat, &ODBC_err, (unsigned char *)ODBC_msg, 100, &ODBC_mlen);
                SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env);
                connected = 0;
                return -1;

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 4aba559eff7ad57abd8df2fa516bcabfdd0a8a39..e65a9ade80bb5bd25b5f4cd4c36c3ca4f9e775cc 100644 (file)
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -123,7 +123,7 @@ static int pgsql_log(struct ast_cdr *cdr)
 
                snprintf(sqlcmd,sizeof(sqlcmd),"INSERT INTO %s (calldate,clid,src,dst,dcontext,channel,dstchannel,"
                                 "lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid,userfield) VALUES"
-                                " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%d,%d,'%s',%d,'%s','%s','%s')",
+                                " ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%ld,%ld,'%s',%ld,'%s','%s','%s')",
                                 table,timestr,clid,cdr->src, cdr->dst, dcontext,channel, dstchannel, lastapp, lastdata,
                                 cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, uniqueid, userfield);
                

diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index bdc02cf8bca01a30332868a1495e5cd509d71a2f..14aa9b2bde9b81a685da7b644a08ebbf64ff508f 100644 (file)
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -169,8 +169,8 @@ static int tds_log(struct ast_cdr *cdr)
                        "%s, "          /* start */
                        "%s, "          /* answer */
                        "%s, "          /* end */
-                       "%d, "          /* duration */
-                       "%d, "          /* billsec */
+                       "%ld, "         /* duration */
+                       "%ld, "         /* billsec */
                        "'%s', "        /* disposition */
                        "'%s', "        /* amaflags */
                        "'%s'"          /* uniqueid */

diff --git a/include/asterisk/cdr.h b/include/asterisk/cdr.h
index c9fc6a92535ff9f286da3fa78d1bfb3a2e685b58..e6685509a31c25018e5df314ae3967ac98760f65 100644 (file)
--- a/include/asterisk/cdr.h
+++ b/include/asterisk/cdr.h
@@ -74,13 +74,13 @@ struct ast_cdr {
        
        struct timeval end;
        /*! Total time in system, in seconds */
-       int duration;                           
+       long int duration;                              
        /*! Total time call is up, in seconds */
-       int billsec;                            
+       long int billsec;                               
        /*! What happened to the call */
-       int disposition;                        
+       long int disposition;                   
        /*! What flags to use */
-       int amaflags;                           
+       long int amaflags;                              
        /*! What account number to use */
        char accountcode[AST_MAX_ACCOUNT_CODE];                 
        /*! flags */

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 29390af68094690180a4deb8749addc2bb94c1d1..933cba28a129fc1760298f6e7ce592276c818dec 100644 (file)
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -105,7 +105,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
                newval = va_arg(aq, const char *);
        }
        va_end(aq);
-       res = SQLPrepare(stmt, sql, SQL_NTS);
+       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);
@@ -148,7 +148,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
        for (x=0;x<colcount;x++) {
                rowdata[0] = '\0';
                collen = sizeof(coltitle);
-               res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen, 
+               res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, 
                                        &datatype, &colsize, &decimaldigits, &nullable);
                if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
                        ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -251,7 +251,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
        if (initfield)
                snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield);
        va_end(aq);
-       res = SQLPrepare(stmt, sql, SQL_NTS);
+       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);
@@ -302,7 +302,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
                for (x=0;x<colcount;x++) {
                        rowdata[0] = '\0';
                        collen = sizeof(coltitle);
-                       res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen, 
+                       res = SQLDescribeCol(stmt, x + 1, (unsigned char *)coltitle, sizeof(coltitle), &collen, 
                                                &datatype, &colsize, &decimaldigits, &nullable);
                        if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
                                ast_log(LOG_WARNING, "SQL Describe Column error!\n[%s]\n\n", sql);
@@ -378,7 +378,7 @@ static int update_odbc(const char *database, const char *table, const char *keyf
        va_end(aq);
        snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " WHERE %s=?", keyfield);
        
-       res = SQLPrepare(stmt, sql, SQL_NTS);
+       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);