[asterisk-commits] tilghman: branch group/ast_storage r65639 - /team/group/ast_storage/res/

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed May 23 10:32:49 2007
New Revision: 65639

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65639
Log:
64-bit compatibility changes

Modified:
    team/group/ast_storage/res/res_storage_odbc.c

Modified: team/group/ast_storage/res/res_storage_odbc.c
URL: http://svn.digium.com/view/asterisk/team/group/ast_storage/res/res_storage_odbc.c?view=diff&rev=65639&r1=65638&r2=65639
==============================================================================
--- team/group/ast_storage/res/res_storage_odbc.c (original)
+++ team/group/ast_storage/res/res_storage_odbc.c Wed May 23 10:32:49 2007
@@ -225,7 +225,7 @@
 		fileformat[0] = '\0';
 		for (x = 0; x < colcount; x++) {
 			int fd = -1;
-			SQLUINTEGER colsize;
+			SQLULEN colsize;
 			SQLSMALLINT decimaldigits, nullable;
 			rowdata[0] = '\0';
 			collen = sizeof(coltitle);
@@ -242,7 +242,7 @@
 				int chunksize = 0x4000000; /* Try 64MB chunks initially */
 				off_t chunk_offset;
 				void *fdm = NULL;
-				SQLINTEGER colsize2;
+				SQLLEN colsize2;
 
 				if (!ast_strlen_zero(fileformat)) {
 					/* We have a file format, just go ahead and create the destination */
@@ -360,7 +360,7 @@
 	strncat(sql, ")", sizeof(sql) - 1);
 
 	if ((strlen(sqlfields) == sizeof(sqlfields) - 1) || (strlen(sql) == sizeof(sql) - 1)) {
-		ast_log(LOG_ERROR, "Data overflow.  Increase SQL buffer size in se_put_odbc() (%d/%d)\n", strlen(sqlfields), strlen(sql));
+		ast_log(LOG_ERROR, "Data overflow.  Increase SQL buffer size in se_put_odbc() (%d/%d)\n", (int)strlen(sqlfields), (int)strlen(sql));
 		ast_config_destroy(cfg);
 		return -1;
 	}
@@ -385,7 +385,7 @@
 
 	while ((dirent = readdir(dir))) {
 		int fd = -1;
-		SQLINTEGER filesize;
+		SQLLEN filesize;
 		off_t offset;
 
 		if (strcmp(dirent->d_name, localfile2) != 0)