--- sql/odbc/parser3odbc.C 2010/10/27 22:48:50 1.37 +++ sql/odbc/parser3odbc.C 2012/06/06 14:50:09 1.40 @@ -1,11 +1,10 @@ /** @file Parser ODBC driver. - Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char *RCSId="$Id: parser3odbc.C,v 1.37 2010/10/27 22:48:50 moko Exp $"; #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] @@ -21,6 +20,8 @@ static const char *RCSId="$Id: parser3od #define WINVER 0x0400 #include +volatile const char * IDENT_PARSER3ODBC_C="$Id: parser3odbc.C,v 1.40 2012/06/06 14:50:09 moko Exp $" IDENT_PA_SQL_DRIVER_H; + // defines #define MAX_COLS 500 @@ -531,7 +532,7 @@ private: result.limit=true; result.statement=statement_limited; - snprintf(statement_limited, MAX_NUMBER+11, "SELECT TOP %u", (limit)?limit+offset:0/*no point to skip anything if we need 0 rows*/); + snprintf(statement_limited, MAX_NUMBER+11, "SELECT TOP %lu", (limit)?limit+offset:0/*no point to skip anything if we need 0 rows*/); astatement+=6;/*skip 'select'*/ strcat(statement_limited, astatement); @@ -554,9 +555,9 @@ private: result.offset=true; result.statement=statement_limited; - statement_limited+=snprintf(statement_limited, MAX_NUMBER+15, "SELECT FIRST (%u)", limit); + statement_limited+=snprintf(statement_limited, MAX_NUMBER+15, "SELECT FIRST (%lu)", limit); if(offset && limit/*no reasons to skip something if we need 0 rows*/) - statement_limited+=snprintf(statement_limited, MAX_NUMBER+8, " SKIP (%u)", offset); + statement_limited+=snprintf(statement_limited, MAX_NUMBER+8, " SKIP (%lu)", offset); astatement+=6;/*skip 'select'*/ strcat((char*)result.statement, astatement); @@ -584,7 +585,7 @@ private: void _throw(Connection& connection, long value){ char msg[MAX_STRING]; - snprintf(msg, MAX_STRING, "%u", value); + snprintf(msg, MAX_STRING, "%lu", value); connection.services->_throw(msg); }