Changeset: 8d5fd4fc1743 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d5fd4fc1743
Modified Files:
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
Branch: default
Log Message:
Avoid using the token "exit" for things other than exit().
diffs (truncated from 334 to 300 lines):
diff --git a/clients/odbc/driver/ODBCUtil.h b/clients/odbc/driver/ODBCUtil.h
--- a/clients/odbc/driver/ODBCUtil.h
+++ b/clients/odbc/driver/ODBCUtil.h
@@ -102,7 +102,7 @@ extern char *dupODBCstring(const SQLCHAR
extern SQLCHAR *ODBCwchar2utf8(const SQLWCHAR *s, SQLLEN length, const char
**errmsg);
extern const char *ODBCutf82wchar(const SQLCHAR *s, SQLINTEGER length,
SQLWCHAR *buf, SQLLEN buflen, SQLSMALLINT *buflenout, size_t *consumed);
-#define fixWcharIn(ws, wsl, t, s, errfunc, hdl, exit) \
+#define fixWcharIn(ws, wsl, t, s, errfunc, hdl, bailout) \
do { \
const char *e; \
(s) = (t *) ODBCwchar2utf8((ws), (wsl), &e); \
@@ -111,7 +111,7 @@ extern const char *ODBCutf82wchar(const
errfunc((hdl), \
strcmp(e, "Memory allocation error") == 0 ? \
"HY001" : "HY000", e, 0); \
- exit; \
+ bailout; \
} \
} while (0)
#define fixWcharOut(r, s, sl, ws, wsl, wslp, cw, errfunc, hdl) \
diff --git a/clients/odbc/driver/SQLColumnPrivileges.c
b/clients/odbc/driver/SQLColumnPrivileges.c
--- a/clients/odbc/driver/SQLColumnPrivileges.c
+++ b/clients/odbc/driver/SQLColumnPrivileges.c
@@ -315,13 +315,13 @@ SQLColumnPrivilegesW(SQLHSTMT StatementH
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBColumnPrivileges(stmt,
catalog, SQL_NTS,
@@ -329,7 +329,7 @@ SQLColumnPrivilegesW(SQLHSTMT StatementH
table, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLColumns.c b/clients/odbc/driver/SQLColumns.c
--- a/clients/odbc/driver/SQLColumns.c
+++ b/clients/odbc/driver/SQLColumns.c
@@ -361,13 +361,13 @@ SQLColumnsW(SQLHSTMT StatementHandle,
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBColumns(stmt,
catalog, SQL_NTS,
@@ -375,7 +375,7 @@ SQLColumnsW(SQLHSTMT StatementHandle,
table, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -332,11 +332,11 @@ SQLConnectW(SQLHDBC ConnectionHandle,
clearDbcErrors(dbc);
fixWcharIn(ServerName, NameLength1, SQLCHAR, ds,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
fixWcharIn(UserName, NameLength2, SQLCHAR, uid,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
fixWcharIn(Authentication, NameLength3, SQLCHAR, pwd,
- addDbcError, dbc, goto exit);
+ addDbcError, dbc, goto bailout);
rc = MNDBConnect(dbc,
ds, SQL_NTS,
@@ -344,7 +344,7 @@ SQLConnectW(SQLHDBC ConnectionHandle,
pwd, SQL_NTS,
NULL, 0, NULL);
- exit:
+ bailout:
if (ds)
free(ds);
if (uid)
diff --git a/clients/odbc/driver/SQLForeignKeys.c
b/clients/odbc/driver/SQLForeignKeys.c
--- a/clients/odbc/driver/SQLForeignKeys.c
+++ b/clients/odbc/driver/SQLForeignKeys.c
@@ -389,23 +389,23 @@ SQLForeignKeysW(SQLHSTMT StatementHandle
clearStmtErrors(stmt);
fixWcharIn(PKCatalogName, NameLength1, SQLCHAR,
- PKcatalog, addStmtError, stmt, goto exit);
+ PKcatalog, addStmtError, stmt, goto bailout);
fixWcharIn(PKSchemaName, NameLength2, SQLCHAR,
- PKschema, addStmtError, stmt, goto exit);
+ PKschema, addStmtError, stmt, goto bailout);
fixWcharIn(PKTableName, NameLength3, SQLCHAR,
- PKtable, addStmtError, stmt, goto exit);
+ PKtable, addStmtError, stmt, goto bailout);
fixWcharIn(FKCatalogName, NameLength4, SQLCHAR,
- FKcatalog, addStmtError, stmt, goto exit);
+ FKcatalog, addStmtError, stmt, goto bailout);
fixWcharIn(FKSchemaName, NameLength5, SQLCHAR,
- FKschema, addStmtError, stmt, goto exit);
+ FKschema, addStmtError, stmt, goto bailout);
fixWcharIn(FKTableName, NameLength6, SQLCHAR,
- FKtable, addStmtError, stmt, goto exit);
+ FKtable, addStmtError, stmt, goto bailout);
rc = MNDBForeignKeys(stmt, PKcatalog, SQL_NTS, PKschema, SQL_NTS,
PKtable, SQL_NTS, FKcatalog, SQL_NTS,
FKschema, SQL_NTS, FKtable, SQL_NTS);
- exit:
+ bailout:
if (PKcatalog)
free(PKcatalog);
if (PKschema)
diff --git a/clients/odbc/driver/SQLPrimaryKeys.c
b/clients/odbc/driver/SQLPrimaryKeys.c
--- a/clients/odbc/driver/SQLPrimaryKeys.c
+++ b/clients/odbc/driver/SQLPrimaryKeys.c
@@ -255,18 +255,18 @@ SQLPrimaryKeysW(SQLHSTMT StatementHandle
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBPrimaryKeys(stmt,
catalog, SQL_NTS,
schema, SQL_NTS,
table, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLProcedureColumns.c
b/clients/odbc/driver/SQLProcedureColumns.c
--- a/clients/odbc/driver/SQLProcedureColumns.c
+++ b/clients/odbc/driver/SQLProcedureColumns.c
@@ -363,13 +363,13 @@ SQLProcedureColumnsW(SQLHSTMT StatementH
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ProcName, NameLength3, SQLCHAR, proc,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ColumnName, NameLength4, SQLCHAR, column,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBProcedureColumns(stmt,
catalog, SQL_NTS,
@@ -377,7 +377,7 @@ SQLProcedureColumnsW(SQLHSTMT StatementH
proc, SQL_NTS,
column, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLProcedures.c
b/clients/odbc/driver/SQLProcedures.c
--- a/clients/odbc/driver/SQLProcedures.c
+++ b/clients/odbc/driver/SQLProcedures.c
@@ -259,18 +259,18 @@ SQLProceduresW(SQLHSTMT StatementHandle,
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(ProcName, NameLength3, SQLCHAR, proc,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBProcedures(stmt,
catalog, SQL_NTS,
schema, SQL_NTS,
proc, SQL_NTS);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLSpecialColumns.c
b/clients/odbc/driver/SQLSpecialColumns.c
--- a/clients/odbc/driver/SQLSpecialColumns.c
+++ b/clients/odbc/driver/SQLSpecialColumns.c
@@ -446,11 +446,11 @@ SQLSpecialColumnsW(SQLHSTMT StatementHan
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBSpecialColumns(stmt,
IdentifierType,
@@ -460,7 +460,7 @@ SQLSpecialColumnsW(SQLHSTMT StatementHan
Scope,
Nullable);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLStatistics.c
b/clients/odbc/driver/SQLStatistics.c
--- a/clients/odbc/driver/SQLStatistics.c
+++ b/clients/odbc/driver/SQLStatistics.c
@@ -351,11 +351,11 @@ SQLStatisticsW(SQLHSTMT StatementHandle,
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBStatistics(stmt,
catalog, SQL_NTS,
@@ -364,7 +364,7 @@ SQLStatisticsW(SQLHSTMT StatementHandle,
Unique,
Reserved);
- exit:
+ bailout:
if (catalog)
free(catalog);
if (schema)
diff --git a/clients/odbc/driver/SQLTablePrivileges.c
b/clients/odbc/driver/SQLTablePrivileges.c
--- a/clients/odbc/driver/SQLTablePrivileges.c
+++ b/clients/odbc/driver/SQLTablePrivileges.c
@@ -277,18 +277,18 @@ SQLTablePrivilegesW(SQLHSTMT StatementHa
clearStmtErrors(stmt);
fixWcharIn(CatalogName, NameLength1, SQLCHAR, catalog,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(SchemaName, NameLength2, SQLCHAR, schema,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
fixWcharIn(TableName, NameLength3, SQLCHAR, table,
- addStmtError, stmt, goto exit);
+ addStmtError, stmt, goto bailout);
rc = MNDBTablePrivileges(stmt,
catalog, SQL_NTS,
schema, SQL_NTS,
table, SQL_NTS);
- exit:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
