Utilize _odbc_get_string_size() in SQLPrepare()

This commit is contained in:
whydoubt
2004-04-13 03:17:19 +00:00
parent 91a0f74094
commit c18667e9f2
2 changed files with 8 additions and 9 deletions

View File

@@ -1,6 +1,7 @@
Mon Apr 12 21:58:00 CDT 2004 Jeff Smith <whydoubt@yahoo.com> Mon Apr 12 21:58:00 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/odbc/connectparams.c: ODBC driver dialog enhancements * src/odbc/connectparams.c: ODBC driver dialog enhancements
* src/sql/mdbsql.c: Correct some array sizes * src/sql/mdbsql.c: Correct some array sizes
* src/odb/odbc.c: Utilize _odbc_get_string_size() in SQLPrepare()
Mon Apr 12 09:56:23 EDT 2004 Brian Bruns <brian@bruns.com> Mon Apr 12 09:56:23 EDT 2004 Brian Bruns <brian@bruns.com>
* include/mdbtools: * include/mdbtools:

View File

@@ -32,7 +32,7 @@
#include "connectparams.h" #include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.16 2004/03/25 10:34:07 brianb Exp $"; static char software_version[] = "$Id: odbc.c,v 1.17 2004/04/13 03:17:20 whydoubt Exp $";
static void *no_unused_var_warn[] = {software_version, static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn}; no_unused_var_warn};
@@ -980,17 +980,15 @@ SQLRETURN SQL_API SQLPrepare(
SQLCHAR FAR *szSqlStr, SQLCHAR FAR *szSqlStr,
SQLINTEGER cbSqlStr) SQLINTEGER cbSqlStr)
{ {
struct _hstmt *stmt=(struct _hstmt *)hstmt; struct _hstmt *stmt=(struct _hstmt *)hstmt;
int sqllen = _odbc_get_string_size(cbSqlStr, szSqlStr);
TRACE("SQLPrepare"); TRACE("SQLPrepare");
if (cbSqlStr!=SQL_NTS) {
strncpy(stmt->query, szSqlStr, cbSqlStr);
stmt->query[cbSqlStr]='\0';
} else {
strcpy(stmt->query, szSqlStr);
}
return SQL_SUCCESS; strncpy(stmt->query, szSqlStr, sqllen);
stmt->query[sqllen]='\0';
return SQL_SUCCESS;
} }
SQLRETURN SQL_API SQLRowCount( SQLRETURN SQL_API SQLRowCount(