MySQL Lists: commits: ODBC C-tests commit: r145 - trunk/testsuites/t_charset

List:	Commits	« Previous Message Next Message »
From:	sebrecht	Date:	June 14 2007 5:29pm
Subject:	ODBC C-tests commit: r145 - trunk/testsuites/t_charset_bug
View as plain text
Modified:
   trunk/testsuites/t_charset_bug/charsettest.c
Log:
change len variable


Modified: trunk/testsuites/t_charset_bug/charsettest.c
===================================================================
--- trunk/testsuites/t_charset_bug/charsettest.c	2007-06-13 17:59:11 UTC (rev 144)
+++ trunk/testsuites/t_charset_bug/charsettest.c	2007-06-14 15:29:23 UTC (rev 145)
@@ -174,7 +174,7 @@
   SQLHANDLE stmt;
   SQLRETURN rc;
   SQLCHAR rslt[3][STRLEN];
-  SQLINTEGER *len;
+  SQLLEN len;
   char delqry[1024];
   char *delor;
   char *word1;
@@ -192,8 +192,6 @@
 
   stmt= get_statement();
 
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
-
   i= 0;
   cnt= 0;
 
@@ -249,7 +247,7 @@
   for (i= 0; (rc = SQLFetch(stmt)) == SQL_SUCCESS; ++i)
   {
     CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_CHAR,
-			   rslt[i], STRLEN, &len[i]), stmt);
+			   rslt[i], STRLEN, &len), stmt);
     test_printf("text found: %s\n", rslt[i]);
   }
   test_printf("%d rows selected\n", i);
@@ -281,7 +279,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)checkqry, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len), stmt);
 
   if (cnt > 0)
   {
@@ -324,7 +322,7 @@
   SQLHANDLE stmt;
   SQLRETURN rc;
   SQLCHAR rslt[3][STRLEN];
-  SQLINTEGER *len;
+  SQLLEN len;
   char delqry[1024];
   char *delor;
   char *word1;
@@ -342,8 +340,6 @@
 
   stmt= get_statement();
 
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
-
   i= 0;
   cnt= 0;
 
@@ -402,7 +398,7 @@
   for (i= 0; (rc = SQLFetch(stmt)) == SQL_SUCCESS; ++i)
   {
     CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_CHAR,
-			   rslt[i], STRLEN, &len[i]), stmt);
+			   rslt[i], STRLEN, &len), stmt);
     test_printf("text found: %s\n", rslt[i]);
   }
   test_printf("%d rows selected\n", i);
@@ -437,7 +433,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)checkqry, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len), stmt);
 
   if (cnt > 0)
   {
@@ -475,7 +471,7 @@
 OT_TEST_METHOD(update)
 {
   SQLHANDLE stmt;
-  SQLINTEGER *len;
+  SQLLEN len;
   char *qry1;
   char *qry2;
   char *qry3;
@@ -503,8 +499,6 @@
     "or german like _latin1'     "or german like _latin1'd 
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
-
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)qry1, SQL_NTS), stmt);
   reset_statement(stmt);
   
@@ -517,7 +511,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)checkqry, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len), stmt);
 
   free_statement(stmt);
   
@@ -540,7 +534,7 @@
 OT_TEST_METHOD(updatesetnames)
 {
   SQLHANDLE stmt;
-  SQLINTEGER *len;
+  SQLLEN len;
   char *qry1;
   char *qry2;
   char *qry3;
@@ -568,8 +562,6 @@
     "or german like 'Franz     "or german like ' 
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
-
   /* CHECK_SQL_S(SQLExecDirect(stmt, "set names latin1", SQL_NTS), stmt);
      reset_statement(stmt);*/
 
@@ -588,7 +580,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)checkqry, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &cnt, 0, &len), stmt);
 
   free_statement(stmt);
 
@@ -613,7 +605,7 @@
   SQLHANDLE stmt;
   SQLRETURN rc;
   SQLCHAR rslt[3][STRLEN];
-  SQLINTEGER *len;
+  SQLLEN len;
   char delqry[1024];
   char *delor;
   char *origword1;
@@ -634,8 +626,6 @@
   int cnt;
 
   stmt= get_statement();
-  
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
   i= 0;
   cnt= 0;
   
@@ -681,7 +671,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry1, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
   reset_statement(stmt);
   
   if (i!=3)
@@ -690,7 +680,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry2, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
     
     if (i!=3)
     {
@@ -756,7 +746,7 @@
   for (i= 0; (rc = SQLFetch(stmt)) == SQL_SUCCESS; ++i)
   {
     CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_CHAR,
-			   rslt[i], STRLEN, &len[i]), stmt);
+			   rslt[i], STRLEN, &len), stmt);
     test_printf("text found: %s\n", rslt[i]);
   }
   test_printf("%d rows selected\n", i);
@@ -793,7 +783,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry2, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
     if (i > 0)
     {
       free_statement(stmt);
@@ -807,7 +797,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry1, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
     
     if (i > 0)
     {
@@ -836,7 +826,7 @@
   SQLHANDLE stmt;
   SQLRETURN rc;
   SQLCHAR rslt[3][STRLEN];
-  SQLINTEGER *len;
+  SQLLEN len;
   char delqry[1024];
   char *delor;
   char *origword1;
@@ -858,8 +848,6 @@
 
   stmt= get_statement();
 
-  len= (SQLINTEGER *)malloc(sizeof(SQLINTEGER));
-
   i= 0;
   cnt= 0;
 
@@ -908,7 +896,7 @@
   CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry1, SQL_NTS), stmt);
 
   CHECK_SQL_S(SQLFetch(stmt), stmt);
-  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+  CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
   reset_statement(stmt);
 
   if (i!=3)
@@ -917,7 +905,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry2, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
 
     if (i!=3)
     {
@@ -983,7 +971,7 @@
   for (i= 0; (rc = SQLFetch(stmt)) == SQL_SUCCESS; ++i)
   {
     CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_CHAR,
-			   rslt[i], STRLEN, &len[i]), stmt);
+			   rslt[i], STRLEN, &len), stmt);
     test_printf("text found: %s\n", rslt[i]);
   }
   test_printf("%d rows selected\n", i);
@@ -1020,7 +1008,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry2, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
     if (i > 0)
     {
       free_statement(stmt);
@@ -1034,7 +1022,7 @@
     CHECK_SQL_S(SQLExecDirect(stmt, (SQLCHAR *)cntqry1, SQL_NTS), stmt);
 
     CHECK_SQL_S(SQLFetch(stmt), stmt);
-    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len[0]), stmt);
+    CHECK_SQL_S(SQLGetData(stmt, 1, SQL_C_LONG, &i, 0, &len), stmt);
     if (i > 0)
     {
       free_statement(stmt);
Thread
• ODBC C-tests commit: r145 - trunk/testsuites/t_charset_bug	sebrecht	14 Jun