From 8362e4dc870691337b3b04ae3f0f19828a1b968d Mon Sep 17 00:00:00 2001
From: whydoubt <whydoubt>
Date: Sat, 27 Nov 2004 18:18:54 +0000
Subject: [PATCH] Update ascii2unicode conversion calls

---
 ChangeLog       |  3 +++
 src/odbc/odbc.c | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec50562..ac5b7db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat Nov 27 12:16:08 CST 2004	Jeff Smith <whydoubt@yahoo.com>
+	* src/odbc/odbc.c: Update ascii2unicode conversion calls
+
 Fri Nov 26 00:10:58 EST 2004	Brian Bruns <brian@bruns.com>
 	* include/mdbtools.h:
 	* src/gmdb2/table_def.c:
diff --git a/src/odbc/odbc.c b/src/odbc/odbc.c
index 3fc15ff..a02c554 100644
--- a/src/odbc/odbc.c
+++ b/src/odbc/odbc.c
@@ -27,7 +27,7 @@
 
 #include "connectparams.h"
 
-static char  software_version[]   = "$Id: odbc.c,v 1.25 2004/10/16 14:21:16 whydoubt Exp $";
+static char  software_version[]   = "$Id: odbc.c,v 1.26 2004/11/27 18:18:55 whydoubt Exp $";
 static void *no_unused_var_warn[] = {software_version,
                                      no_unused_var_warn};
 
@@ -1081,9 +1081,9 @@ SQLRETURN SQL_API SQLColumns(
 		for (j=0; j<table->num_cols; j++) {
 			col = g_ptr_array_index(table->columns, j);
 
-			ts2 = mdb_ascii2unicode(mdb, table->name, 0, 100, t2);
-			ts3 = mdb_ascii2unicode(mdb, col->name, 0, 100, t3);
-			ts5 = mdb_ascii2unicode(mdb, "FIX ME", 0, 100, t5);
+			ts2 = mdb_ascii2unicode(mdb, table->name, 0, 100, t2, MDB_BIND_SIZE);
+			ts3 = mdb_ascii2unicode(mdb, col->name, 0, 100, t3, MDB_BIND_SIZE);
+			ts5 = mdb_ascii2unicode(mdb, "FIX ME", 0, 100, t5, MDB_BIND_SIZE);
 			nullable = SQL_NO_NULLS;
 			datatype = _odbc_get_client_type(col->col_type);
 			sqldatatype = _odbc_get_client_type(col->col_type);
@@ -1384,11 +1384,11 @@ SQLRETURN SQL_API SQLGetTypeInfo(
 		if (fSqlType && (fSqlType != type_info[i].data_type))
 			continue;
 
-		ts0 = mdb_ascii2unicode(mdb, type_info[i].type_name, 0, 100, t0);
-		ts3 = mdb_ascii2unicode(mdb, type_info[i].literal_prefix, 0, 100, t3);
-		ts4 = mdb_ascii2unicode(mdb, type_info[i].literal_suffix, 0, 100, t4);
-		ts5 = mdb_ascii2unicode(mdb, type_info[i].create_params, 0, 100, t5);
-		ts12 = mdb_ascii2unicode(mdb, type_info[i].local_type_name, 0, 100, t12);
+		ts0 = mdb_ascii2unicode(mdb, type_info[i].type_name, 0, 100, t0, MDB_BIND_SIZE);
+		ts3 = mdb_ascii2unicode(mdb, type_info[i].literal_prefix, 0, 100, t3, MDB_BIND_SIZE);
+		ts4 = mdb_ascii2unicode(mdb, type_info[i].literal_suffix, 0, 100, t4, MDB_BIND_SIZE);
+		ts5 = mdb_ascii2unicode(mdb, type_info[i].create_params, 0, 100, t5, MDB_BIND_SIZE);
+		ts12 = mdb_ascii2unicode(mdb, type_info[i].local_type_name, 0, 100, t12, MDB_BIND_SIZE);
 
 		FILL_FIELD(&fields[0], t0, ts0);
 		FILL_FIELD(&fields[1],&type_info[i].data_type, 0);
@@ -1542,8 +1542,8 @@ SQLRETURN SQL_API SQLTables(
 			FILL_FIELD(&fields[j], NULL, 0);
 		}
 
-		ts2 = mdb_ascii2unicode(mdb, entry->object_name, 0, 100, t2);
-		ts3 = mdb_ascii2unicode(mdb, table_types[ttype], 0, 100, t3);
+		ts2 = mdb_ascii2unicode(mdb, entry->object_name, 0, 100, t2, MDB_BIND_SIZE);
+		ts3 = mdb_ascii2unicode(mdb, table_types[ttype], 0, 100, t3, MDB_BIND_SIZE);
 
 		FILL_FIELD(&fields[2], t2, ts2);
 		FILL_FIELD(&fields[3], t3, ts3);