Skip to content

Commit b206958

Browse files
author
Byron Nikolaidis
committed
Official V.0244 (missed a file)
1 parent 0957e08 commit b206958

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

‎src/interfaces/odbc/info.c

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,6 @@ RETCODE result;
984984
char *tableType;
985985
char tables_query[MAX_STATEMENT_LEN];
986986
char table_name[MAX_INFO_STRING], table_owner[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING];
987-
// SDWORD table_name_len, table_owner_len, relhasrules_len;
988987
ConnInfo *ci;
989988
char *prefix[32], prefixes[MEDIUM_REGISTRY_LEN];
990989
char *table_type[32], table_types[MAX_INFO_STRING];
@@ -1092,7 +1091,7 @@ mylog("**** SQLTables(): ENTER, stmt=%u\n", stmt);
10921091
}
10931092

10941093
result = SQLBindCol(htbl_stmt, 1, SQL_C_CHAR,
1095-
table_name, MAX_INFO_STRING, NULL /* &table_name_len */);
1094+
table_name, MAX_INFO_STRING, NULL);
10961095
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
10971096
stmt->errormsg = tbl_stmt->errormsg;
10981097
stmt->errornumber = tbl_stmt->errornumber;
@@ -1101,15 +1100,15 @@ mylog("**** SQLTables(): ENTER, stmt=%u\n", stmt);
11011100
}
11021101

11031102
result = SQLBindCol(htbl_stmt, 2, SQL_C_CHAR,
1104-
table_owner, MAX_INFO_STRING, NULL /* &table_owner_len */);
1103+
table_owner, MAX_INFO_STRING, NULL);
11051104
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
11061105
stmt->errormsg = tbl_stmt->errormsg;
11071106
stmt->errornumber = tbl_stmt->errornumber;
11081107
SQLFreeStmt(htbl_stmt, SQL_DROP);
11091108
return SQL_ERROR;
11101109
}
11111110
result = SQLBindCol(htbl_stmt, 3, SQL_C_CHAR,
1112-
relhasrules, MAX_INFO_STRING, NULL /* &relhasrules_len */);
1111+
relhasrules, MAX_INFO_STRING, NULL);
11131112
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
11141113
stmt->errormsg = tbl_stmt->errormsg;
11151114
stmt->errornumber = tbl_stmt->errornumber;
@@ -1239,11 +1238,7 @@ RETCODE result;
12391238
char table_owner[MAX_INFO_STRING], table_name[MAX_INFO_STRING], field_name[MAX_INFO_STRING], field_type_name[MAX_INFO_STRING];
12401239
Int2 field_number, field_length, mod_length;
12411240
Int4 field_type;
1242-
char not_null[2];
1243-
/* SDWORD table_owner_len, table_name_len, field_name_len,
1244-
field_type_len, field_type_name_len, field_number_len,
1245-
field_length_len, mod_length_len, not_null_len;
1246-
*/
1241+
char not_null[MAX_INFO_STRING];
12471242
ConnInfo *ci;
12481243

12491244

@@ -1292,7 +1287,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
12921287
}
12931288

12941289
result = SQLBindCol(hcol_stmt, 1, SQL_C_CHAR,
1295-
table_owner, MAX_INFO_STRING, NULL /* &table_owner_len */);
1290+
table_owner, MAX_INFO_STRING, NULL);
12961291
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
12971292
stmt->errormsg = col_stmt->errormsg;
12981293
stmt->errornumber = col_stmt->errornumber;
@@ -1301,7 +1296,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13011296
}
13021297

13031298
result = SQLBindCol(hcol_stmt, 2, SQL_C_CHAR,
1304-
table_name, MAX_INFO_STRING, NULL /* &table_name_len */);
1299+
table_name, MAX_INFO_STRING, NULL);
13051300
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13061301
stmt->errormsg = col_stmt->errormsg;
13071302
stmt->errornumber = col_stmt->errornumber;
@@ -1310,7 +1305,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13101305
}
13111306

13121307
result = SQLBindCol(hcol_stmt, 3, SQL_C_CHAR,
1313-
field_name, MAX_INFO_STRING, NULL /* &field_name_len */);
1308+
field_name, MAX_INFO_STRING, NULL);
13141309
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13151310
stmt->errormsg = col_stmt->errormsg;
13161311
stmt->errornumber = col_stmt->errornumber;
@@ -1319,7 +1314,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13191314
}
13201315

13211316
result = SQLBindCol(hcol_stmt, 4, SQL_C_DEFAULT,
1322-
&field_type, 4, NULL /* &field_type_len */);
1317+
&field_type, 4, NULL);
13231318
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13241319
stmt->errormsg = col_stmt->errormsg;
13251320
stmt->errornumber = col_stmt->errornumber;
@@ -1328,7 +1323,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13281323
}
13291324

13301325
result = SQLBindCol(hcol_stmt, 5, SQL_C_CHAR,
1331-
field_type_name, MAX_INFO_STRING, NULL /* &field_type_name_len */);
1326+
field_type_name, MAX_INFO_STRING, NULL);
13321327
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13331328
stmt->errormsg = col_stmt->errormsg;
13341329
stmt->errornumber = col_stmt->errornumber;
@@ -1337,7 +1332,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13371332
}
13381333

13391334
result = SQLBindCol(hcol_stmt, 6, SQL_C_DEFAULT,
1340-
&field_number, MAX_INFO_STRING, NULL /* &field_number_len */);
1335+
&field_number, MAX_INFO_STRING, NULL);
13411336
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13421337
stmt->errormsg = col_stmt->errormsg;
13431338
stmt->errornumber = col_stmt->errornumber;
@@ -1346,7 +1341,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13461341
}
13471342

13481343
result = SQLBindCol(hcol_stmt, 7, SQL_C_DEFAULT,
1349-
&field_length, MAX_INFO_STRING, NULL /* &field_length_len */);
1344+
&field_length, MAX_INFO_STRING, NULL);
13501345
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13511346
stmt->errormsg = col_stmt->errormsg;
13521347
stmt->errornumber = col_stmt->errornumber;
@@ -1355,7 +1350,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13551350
}
13561351

13571352
result = SQLBindCol(hcol_stmt, 8, SQL_C_DEFAULT,
1358-
&mod_length, MAX_INFO_STRING, NULL /* &mod_length_len */);
1353+
&mod_length, MAX_INFO_STRING, NULL);
13591354
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13601355
stmt->errormsg = col_stmt->errormsg;
13611356
stmt->errornumber = col_stmt->errornumber;
@@ -1364,7 +1359,7 @@ mylog("**** SQLColumns(): ENTER, stmt=%u\n", stmt);
13641359
}
13651360

13661361
result = SQLBindCol(hcol_stmt, 9, SQL_C_CHAR,
1367-
&not_null, MAX_INFO_STRING, NULL /* &not_null_len */);
1362+
not_null, MAX_INFO_STRING, NULL);
13681363
if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO)) {
13691364
stmt->errormsg = col_stmt->errormsg;
13701365
stmt->errornumber = col_stmt->errornumber;

0 commit comments

Comments
 (0)