Changeset: faa2068e9805 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faa2068e9805
Modified Files:
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCDbc.h
clients/odbc/driver/ODBCStmt.h
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLDriverConnect.c
clients/odbc/driver/SQLExecDirect.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLNativeSql.c
clients/odbc/driver/SQLPrepare.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLSetCursorName.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
Branch: linear-hashing
Log Message:
Added "const" to internal interfaces of ODBC driver.
diffs (truncated from 372 to 300 lines):
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -2868,7 +2868,7 @@ ODBCStore(ODBCStmt *stmt,
char **bufp,
size_t *bufposp,
size_t *buflenp,
- char *sep)
+ const char *sep)
{
ODBCDescRec *ipdrec, *apdrec;
SQLPOINTER ptr;
diff --git a/clients/odbc/driver/ODBCDbc.h b/clients/odbc/driver/ODBCDbc.h
--- a/clients/odbc/driver/ODBCDbc.h
+++ b/clients/odbc/driver/ODBCDbc.h
@@ -137,7 +137,7 @@ ODBCError *getDbcError(ODBCDbc *dbc);
*/
void destroyODBCDbc(ODBCDbc *dbc);
-int ODBCGetKeyAttr(SQLCHAR **conn, SQLSMALLINT *nconn, char **key, char
**attr);
+int ODBCGetKeyAttr(const SQLCHAR **conn, SQLSMALLINT *nconn, char **key, char
**attr);
SQLRETURN ODBCConnectionString(SQLRETURN rc, ODBCDbc *dbc,
SQLCHAR *OutConnectionString,
SQLSMALLINT BufferLength,
@@ -146,7 +146,7 @@ SQLRETURN ODBCConnectionString(SQLRETURN
const char *pwd, const char *host,
int port, const char *database);
SQLRETURN MNDBAllocStmt(ODBCDbc *dbc, SQLHANDLE *pnOutputHandle);
-SQLRETURN MNDBConnect(ODBCDbc *dbc, SQLCHAR *szDataSource, SQLSMALLINT
nDataSourceLength, SQLCHAR *szUID, SQLSMALLINT nUIDLength, SQLCHAR *szPWD,
SQLSMALLINT nPWDLength, const char *host, int port, const char *schema);
+SQLRETURN MNDBConnect(ODBCDbc *dbc, const SQLCHAR *szDataSource, SQLSMALLINT
nDataSourceLength, const SQLCHAR *szUID, SQLSMALLINT nUIDLength, const SQLCHAR
*szPWD, SQLSMALLINT nPWDLength, const char *host, int port, const char *schema);
SQLRETURN MNDBGetConnectAttr(ODBCDbc *dbc, SQLINTEGER Attribute, SQLPOINTER
ValuePtr, SQLINTEGER BufferLength, SQLINTEGER *StringLength);
SQLRETURN MNDBSetConnectAttr(ODBCDbc *dbc, SQLINTEGER Attribute, SQLPOINTER
ValuePtr, SQLINTEGER StringLength);
diff --git a/clients/odbc/driver/ODBCStmt.h b/clients/odbc/driver/ODBCStmt.h
--- a/clients/odbc/driver/ODBCStmt.h
+++ b/clients/odbc/driver/ODBCStmt.h
@@ -180,7 +180,7 @@ SQLRETURN ODBCFetch(ODBCStmt *stmt, SQLU
SQLULEN row);
SQLRETURN ODBCStore(ODBCStmt *stmt, SQLUSMALLINT param, SQLLEN offset,
SQLULEN row, char **bufp, size_t *bufposp, size_t *buflenp,
- char *sep);
+ const char *sep);
SQLRETURN ODBCFreeStmt_(ODBCStmt *stmt);
SQLRETURN ODBCInitResult(ODBCStmt *stmt);
const char *ODBCGetTypeInfo(int concise_type, int *data_type,
@@ -198,7 +198,7 @@ SQLRETURN MNDBColAttribute(ODBCStmt *stm
SQLUSMALLINT nFieldIdentifier,
SQLPOINTER pszValue, SQLSMALLINT nValueLengthMax,
SQLSMALLINT *pnValueLength, LENP_OR_POINTER_T
pnValue);
-SQLRETURN MNDBExecDirect(ODBCStmt *stmt, SQLCHAR *szSqlStr,
+SQLRETURN MNDBExecDirect(ODBCStmt *stmt, const SQLCHAR *szSqlStr,
SQLINTEGER nSqlStr);
SQLRETURN MNDBExecute(ODBCStmt *stmt);
SQLRETURN MNDBFetch(ODBCStmt *stmt, SQLUSMALLINT *RowStatusArray);
@@ -208,7 +208,7 @@ SQLRETURN MNDBFreeStmt(ODBCStmt *stmt, S
SQLRETURN MNDBGetStmtAttr(ODBCStmt *stmt, SQLINTEGER Attribute,
SQLPOINTER Value, SQLINTEGER BufferLength,
SQLINTEGER *StringLength);
-SQLRETURN MNDBPrepare(ODBCStmt *stmt, SQLCHAR *szSqlStr,
+SQLRETURN MNDBPrepare(ODBCStmt *stmt, const SQLCHAR *szSqlStr,
SQLINTEGER nSqlStrLength);
SQLRETURN MNDBSetStmtAttr(ODBCStmt *stmt, SQLINTEGER Attribute,
SQLPOINTER Value, SQLINTEGER StringLength);
diff --git a/clients/odbc/driver/SQLBrowseConnect.c
b/clients/odbc/driver/SQLBrowseConnect.c
--- a/clients/odbc/driver/SQLBrowseConnect.c
+++ b/clients/odbc/driver/SQLBrowseConnect.c
@@ -43,7 +43,7 @@
static SQLRETURN
MNDBBrowseConnect(ODBCDbc *dbc,
- SQLCHAR *InConnectionString,
+ const SQLCHAR *InConnectionString,
SQLSMALLINT StringLength1,
SQLCHAR *OutConnectionString,
SQLSMALLINT BufferLength,
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
@@ -31,13 +31,13 @@
static SQLRETURN
MNDBColumnPrivileges(ODBCStmt *stmt,
- SQLCHAR *CatalogName,
+ const SQLCHAR *CatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *SchemaName,
+ const SQLCHAR *SchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *TableName,
+ const SQLCHAR *TableName,
SQLSMALLINT NameLength3,
- SQLCHAR *ColumnName,
+ const SQLCHAR *ColumnName,
SQLSMALLINT NameLength4)
{
RETCODE rc;
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
@@ -34,13 +34,13 @@
static SQLRETURN
MNDBColumns(ODBCStmt *stmt,
- SQLCHAR *CatalogName,
+ const SQLCHAR *CatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *SchemaName,
+ const SQLCHAR *SchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *TableName,
+ const SQLCHAR *TableName,
SQLSMALLINT NameLength3,
- SQLCHAR *ColumnName,
+ const SQLCHAR *ColumnName,
SQLSMALLINT NameLength4)
{
RETCODE rc;
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
@@ -102,11 +102,11 @@ get_serverinfo(ODBCDbc *dbc)
SQLRETURN
MNDBConnect(ODBCDbc *dbc,
- SQLCHAR *ServerName,
+ const SQLCHAR *ServerName,
SQLSMALLINT NameLength1,
- SQLCHAR *UserName,
+ const SQLCHAR *UserName,
SQLSMALLINT NameLength2,
- SQLCHAR *Authentication,
+ const SQLCHAR *Authentication,
SQLSMALLINT NameLength3,
const char *host,
int port,
diff --git a/clients/odbc/driver/SQLDriverConnect.c
b/clients/odbc/driver/SQLDriverConnect.c
--- a/clients/odbc/driver/SQLDriverConnect.c
+++ b/clients/odbc/driver/SQLDriverConnect.c
@@ -35,9 +35,9 @@
#endif
int
-ODBCGetKeyAttr(SQLCHAR **conn, SQLSMALLINT *nconn, char **key, char **attr)
+ODBCGetKeyAttr(const SQLCHAR **conn, SQLSMALLINT *nconn, char **key, char
**attr)
{
- SQLCHAR *p;
+ const SQLCHAR *p;
size_t len;
*key = *attr = NULL;
@@ -261,7 +261,7 @@ translateDriverCompletion(SQLUSMALLINT D
static SQLRETURN
MNDBDriverConnect(ODBCDbc *dbc,
SQLHWND WindowHandle,
- SQLCHAR *InConnectionString,
+ const SQLCHAR *InConnectionString,
SQLSMALLINT StringLength1,
SQLCHAR *OutConnectionString,
SQLSMALLINT BufferLength,
diff --git a/clients/odbc/driver/SQLExecDirect.c
b/clients/odbc/driver/SQLExecDirect.c
--- a/clients/odbc/driver/SQLExecDirect.c
+++ b/clients/odbc/driver/SQLExecDirect.c
@@ -30,7 +30,7 @@
#include "ODBCUtil.h"
static SQLRETURN
-ODBCExecDirect(ODBCStmt *stmt, SQLCHAR *StatementText, SQLINTEGER TextLength)
+ODBCExecDirect(ODBCStmt *stmt, const SQLCHAR *StatementText, SQLINTEGER
TextLength)
{
char *query;
const char *err;
@@ -114,7 +114,7 @@ ODBCExecDirect(ODBCStmt *stmt, SQLCHAR *
SQLRETURN
MNDBExecDirect(ODBCStmt *stmt,
- SQLCHAR *StatementText,
+ const SQLCHAR *StatementText,
SQLINTEGER TextLength)
{
SQLRETURN ret;
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
@@ -31,17 +31,17 @@
static SQLRETURN
MNDBForeignKeys(ODBCStmt *stmt,
- SQLCHAR *PKCatalogName,
+ const SQLCHAR *PKCatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *PKSchemaName,
+ const SQLCHAR *PKSchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *PKTableName,
+ const SQLCHAR *PKTableName,
SQLSMALLINT NameLength3,
- SQLCHAR *FKCatalogName,
+ const SQLCHAR *FKCatalogName,
SQLSMALLINT NameLength4,
- SQLCHAR *FKSchemaName,
+ const SQLCHAR *FKSchemaName,
SQLSMALLINT NameLength5,
- SQLCHAR *FKTableName,
+ const SQLCHAR *FKTableName,
SQLSMALLINT NameLength6)
{
RETCODE rc;
diff --git a/clients/odbc/driver/SQLNativeSql.c
b/clients/odbc/driver/SQLNativeSql.c
--- a/clients/odbc/driver/SQLNativeSql.c
+++ b/clients/odbc/driver/SQLNativeSql.c
@@ -31,7 +31,7 @@
static SQLRETURN
MNDBNativeSql(ODBCDbc *dbc,
- SQLCHAR *InStatementText,
+ const SQLCHAR *InStatementText,
SQLINTEGER TextLength1,
SQLCHAR *OutStatementText,
SQLINTEGER BufferLength,
diff --git a/clients/odbc/driver/SQLPrepare.c b/clients/odbc/driver/SQLPrepare.c
--- a/clients/odbc/driver/SQLPrepare.c
+++ b/clients/odbc/driver/SQLPrepare.c
@@ -45,7 +45,7 @@ ODBCResetStmt(ODBCStmt *stmt)
SQLRETURN
MNDBPrepare(ODBCStmt *stmt,
- SQLCHAR *StatementText,
+ const SQLCHAR *StatementText,
SQLINTEGER TextLength)
{
char *query, *s;
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
@@ -31,11 +31,11 @@
static SQLRETURN
MNDBPrimaryKeys(ODBCStmt *stmt,
- SQLCHAR *CatalogName,
+ const SQLCHAR *CatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *SchemaName,
+ const SQLCHAR *SchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *TableName,
+ const SQLCHAR *TableName,
SQLSMALLINT NameLength3)
{
RETCODE rc;
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
@@ -33,13 +33,13 @@
static SQLRETURN
MNDBProcedureColumns(ODBCStmt *stmt,
- SQLCHAR *CatalogName,
+ const SQLCHAR *CatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *SchemaName,
+ const SQLCHAR *SchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *ProcName,
+ const SQLCHAR *ProcName,
SQLSMALLINT NameLength3,
- SQLCHAR *ColumnName,
+ const SQLCHAR *ColumnName,
SQLSMALLINT NameLength4)
{
RETCODE rc;
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
@@ -32,11 +32,11 @@
static SQLRETURN
MNDBProcedures(ODBCStmt *stmt,
- SQLCHAR *CatalogName,
+ const SQLCHAR *CatalogName,
SQLSMALLINT NameLength1,
- SQLCHAR *SchemaName,
+ const SQLCHAR *SchemaName,
SQLSMALLINT NameLength2,
- SQLCHAR *ProcName,
+ const SQLCHAR *ProcName,
SQLSMALLINT NameLength3)
{
RETCODE rc;
diff --git a/clients/odbc/driver/SQLSetCursorName.c
b/clients/odbc/driver/SQLSetCursorName.c
--- a/clients/odbc/driver/SQLSetCursorName.c
+++ b/clients/odbc/driver/SQLSetCursorName.c
@@ -32,7 +32,7 @@
static SQLRETURN
MNDBSetCursorName(ODBCStmt *stmt,
- SQLCHAR *CursorName,
+ const SQLCHAR *CursorName,
SQLSMALLINT NameLength)
{
fixODBCstring(CursorName, NameLength, SQLSMALLINT,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
