Changeset: 9f70b595fba9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f70b595fba9
Modified Files:
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLAllocConnect.c
clients/odbc/driver/SQLAllocEnv.c
clients/odbc/driver/SQLAllocHandle.c
clients/odbc/driver/SQLAllocStmt.c
clients/odbc/driver/SQLBindCol.c
clients/odbc/driver/SQLBindParameter.c
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLBulkOperations.c
clients/odbc/driver/SQLCancel.c
clients/odbc/driver/SQLCloseCursor.c
clients/odbc/driver/SQLColAttribute.c
clients/odbc/driver/SQLColAttributes.c
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLCopyDesc.c
clients/odbc/driver/SQLDataSources.c
clients/odbc/driver/SQLDescribeCol.c
clients/odbc/driver/SQLDescribeParam.c
clients/odbc/driver/SQLDisconnect.c
clients/odbc/driver/SQLDriverConnect.c
clients/odbc/driver/SQLDrivers.c
clients/odbc/driver/SQLEndTran.c
clients/odbc/driver/SQLError.c
clients/odbc/driver/SQLExecDirect.c
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLExtendedFetch.c
clients/odbc/driver/SQLFetch.c
clients/odbc/driver/SQLFetchScroll.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLFreeConnect.c
clients/odbc/driver/SQLFreeEnv.c
clients/odbc/driver/SQLFreeHandle.c
clients/odbc/driver/SQLFreeStmt.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetConnectOption.c
clients/odbc/driver/SQLGetCursorName.c
clients/odbc/driver/SQLGetData.c
clients/odbc/driver/SQLGetDescField.c
clients/odbc/driver/SQLGetDescRec.c
clients/odbc/driver/SQLGetDiagField.c
clients/odbc/driver/SQLGetDiagRec.c
clients/odbc/driver/SQLGetEnvAttr.c
clients/odbc/driver/SQLGetFunctions.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetStmtAttr.c
clients/odbc/driver/SQLGetStmtOption.c
clients/odbc/driver/SQLGetTypeInfo.c
clients/odbc/driver/SQLMoreResults.c
clients/odbc/driver/SQLNativeSql.c
clients/odbc/driver/SQLNumParams.c
clients/odbc/driver/SQLNumResultCols.c
clients/odbc/driver/SQLParamData.c
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLPrepare.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLPutData.c
clients/odbc/driver/SQLRowCount.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetCursorName.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetDescRec.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetParam.c
clients/odbc/driver/SQLSetPos.c
clients/odbc/driver/SQLSetScrollOptions.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
clients/odbc/driver/SQLTransact.c
Branch: Aug2011
Log Message:
Cosmetics.
- Renamed lots of parameters to the name used in the Microsoft
documentation. This makes comparing the code with the documentation
a lot easier.
- Broke up long lines.
diffs (truncated from 9762 to 300 lines):
diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -182,7 +182,7 @@ ODBCwchar2utf8(const SQLWCHAR *s, SQLLEN
char *
ODBCutf82wchar(const SQLCHAR *s,
SQLINTEGER length,
- SQLWCHAR * buf,
+ SQLWCHAR *buf,
SQLLEN buflen,
SQLSMALLINT *buflenout)
{
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
@@ -145,10 +145,10 @@ extern char *ODBCutf82wchar(const SQLCHA
#endif /* WITH_WCHAR */
/* SQL_DESC_CONCISE_TYPE, SQL_DESC_DATETIME_INTERVAL_CODE, and
- SQL_DESC_TYPE are interdependent and setting one affects the other.
- Also, setting them affect other fields. This is all encoded in
- this table. If a field is equal to UNAFFECTED, it is (you guessed
- it) not affected. */
+ * SQL_DESC_TYPE are interdependent and setting one affects the other.
+ * Also, setting them affect other fields. This is all encoded in
+ * this table. If a field is equal to UNAFFECTED, it is (you guessed
+ * it) not affected. */
#define UNAFFECTED (-1)
struct sql_types {
diff --git a/clients/odbc/driver/SQLAllocConnect.c
b/clients/odbc/driver/SQLAllocConnect.c
--- a/clients/odbc/driver/SQLAllocConnect.c
+++ b/clients/odbc/driver/SQLAllocConnect.c
@@ -40,13 +40,14 @@
#include "ODBCGlobal.h"
SQLRETURN SQL_API
-SQLAllocConnect(SQLHENV hEnv,
- SQLHDBC *phDbc)
+SQLAllocConnect(SQLHENV EnvironmentHandle,
+ SQLHDBC *OutputHandlePtr)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLAllocConnect " PTRFMT "\n", PTRFMTCAST hEnv);
+ ODBCLOG("SQLAllocConnect " PTRFMT "\n", PTRFMTCAST EnvironmentHandle);
#endif
/* use mapping as described in ODBC 3 SDK Help file */
- return SQLAllocHandle_(SQL_HANDLE_DBC, (SQLHANDLE) hEnv, (SQLHANDLE *)
phDbc);
+ return SQLAllocHandle_(SQL_HANDLE_DBC, (SQLHANDLE) EnvironmentHandle,
+ (SQLHANDLE *) OutputHandlePtr);
}
diff --git a/clients/odbc/driver/SQLAllocEnv.c
b/clients/odbc/driver/SQLAllocEnv.c
--- a/clients/odbc/driver/SQLAllocEnv.c
+++ b/clients/odbc/driver/SQLAllocEnv.c
@@ -40,12 +40,13 @@
#include "ODBCGlobal.h"
SQLRETURN SQL_API
-SQLAllocEnv(SQLHENV *phEnv)
+SQLAllocEnv(SQLHENV *OutputHandlePtr)
{
#ifdef ODBCDEBUG
ODBCLOG("SQLAllocEnv\n");
#endif
/* use mapping as described in ODBC 3 SDK Help file */
- return SQLAllocHandle_(SQL_HANDLE_ENV, SQL_NULL_HANDLE, (SQLHANDLE *)
phEnv);
+ return SQLAllocHandle_(SQL_HANDLE_ENV, SQL_NULL_HANDLE,
+ (SQLHANDLE *) OutputHandlePtr);
}
diff --git a/clients/odbc/driver/SQLAllocHandle.c
b/clients/odbc/driver/SQLAllocHandle.c
--- a/clients/odbc/driver/SQLAllocHandle.c
+++ b/clients/odbc/driver/SQLAllocHandle.c
@@ -48,106 +48,103 @@
#include "ODBCError.h"
static SQLRETURN
-SQLAllocEnv_(SQLHANDLE *pnOutputHandle)
+SQLAllocEnv_(SQLHANDLE *OutputHandlePtr)
{
- if (pnOutputHandle == NULL) {
+ if (OutputHandlePtr == NULL) {
return SQL_INVALID_HANDLE;
}
- *pnOutputHandle = (SQLHANDLE *) newODBCEnv();
+ *OutputHandlePtr = (SQLHANDLE *) newODBCEnv();
#ifdef ODBCDEBUG
- ODBCLOG("new env " PTRFMT "\n", PTRFMTCAST *pnOutputHandle);
+ ODBCLOG("new env " PTRFMT "\n", PTRFMTCAST *OutputHandlePtr);
#endif
- return *pnOutputHandle == NULL ? SQL_ERROR : SQL_SUCCESS;
+ return *OutputHandlePtr == NULL ? SQL_ERROR : SQL_SUCCESS;
}
static SQLRETURN
-SQLAllocDbc_(ODBCEnv *env,
- SQLHANDLE *pnOutputHandle)
+SQLAllocDbc_(ODBCEnv *env, SQLHANDLE *OutputHandlePtr)
{
if (env->sql_attr_odbc_version == 0) {
/* Function sequence error */
addEnvError(env, "HY010", NULL, 0);
return SQL_ERROR;
}
- if (pnOutputHandle == NULL) {
+ if (OutputHandlePtr == NULL) {
/* Invalid use of null pointer */
addEnvError(env, "HY009", NULL, 0);
return SQL_ERROR;
}
- *pnOutputHandle = (SQLHANDLE *) newODBCDbc(env);
+ *OutputHandlePtr = (SQLHANDLE *) newODBCDbc(env);
#ifdef ODBCDEBUG
- ODBCLOG("new dbc " PTRFMT "\n", PTRFMTCAST *pnOutputHandle);
+ ODBCLOG("new dbc " PTRFMT "\n", PTRFMTCAST *OutputHandlePtr);
#endif
- return *pnOutputHandle == NULL ? SQL_ERROR : SQL_SUCCESS;
+ return *OutputHandlePtr == NULL ? SQL_ERROR : SQL_SUCCESS;
}
SQLRETURN
-SQLAllocStmt_(ODBCDbc *dbc,
- SQLHANDLE *pnOutputHandle)
+SQLAllocStmt_(ODBCDbc *dbc, SQLHANDLE *OutputHandlePtr)
{
if (!dbc->Connected) {
/* Connection does not exist */
addDbcError(dbc, "08003", NULL, 0);
return SQL_ERROR;
}
- if (pnOutputHandle == NULL) {
+ if (OutputHandlePtr == NULL) {
/* Invalid use of null pointer */
addDbcError(dbc, "HY009", NULL, 0);
return SQL_ERROR;
}
- *pnOutputHandle = (SQLHANDLE *) newODBCStmt(dbc);
+ *OutputHandlePtr = (SQLHANDLE *) newODBCStmt(dbc);
#ifdef ODBCDEBUG
- ODBCLOG("new stmt " PTRFMT "\n", PTRFMTCAST *pnOutputHandle);
+ ODBCLOG("new stmt " PTRFMT "\n", PTRFMTCAST *OutputHandlePtr);
#endif
- return *pnOutputHandle == NULL ? SQL_ERROR : SQL_SUCCESS;
+ return *OutputHandlePtr == NULL ? SQL_ERROR : SQL_SUCCESS;
}
static SQLRETURN
-SQLAllocDesc_(ODBCDbc *dbc,
- SQLHANDLE *pnOutputHandle)
+SQLAllocDesc_(ODBCDbc *dbc, SQLHANDLE *OutputHandlePtr)
{
if (!dbc->Connected) {
/* Connection does not exist */
addDbcError(dbc, "08003", NULL, 0);
return SQL_ERROR;
}
- if (pnOutputHandle == NULL) {
+ if (OutputHandlePtr == NULL) {
/* Invalid use of null pointer */
addDbcError(dbc, "HY009", NULL, 0);
return SQL_ERROR;
}
- *pnOutputHandle = (SQLHANDLE *) newODBCDesc(dbc);
+ *OutputHandlePtr = (SQLHANDLE *) newODBCDesc(dbc);
#ifdef ODBCDEBUG
- ODBCLOG("new desc " PTRFMT "\n", PTRFMTCAST *pnOutputHandle);
+ ODBCLOG("new desc " PTRFMT "\n", PTRFMTCAST *OutputHandlePtr);
#endif
- return *pnOutputHandle == NULL ? SQL_ERROR : SQL_SUCCESS;
+ return *OutputHandlePtr == NULL ? SQL_ERROR : SQL_SUCCESS;
}
SQLRETURN
-SQLAllocHandle_(SQLSMALLINT nHandleType,
- SQLHANDLE nInputHandle,
- SQLHANDLE *pnOutputHandle)
+SQLAllocHandle_(SQLSMALLINT HandleType,
+ SQLHANDLE InputHandle,
+ SQLHANDLE *OutputHandlePtr)
{
- switch (nHandleType) {
+ switch (HandleType) {
case SQL_HANDLE_ENV:
- if (nInputHandle != NULL)
+ if (InputHandle != NULL)
return SQL_INVALID_HANDLE;
- return SQLAllocEnv_(pnOutputHandle);
+ return SQLAllocEnv_(OutputHandlePtr);
case SQL_HANDLE_DBC:
- if (!isValidEnv((ODBCEnv *) nInputHandle))
+ if (!isValidEnv((ODBCEnv *) InputHandle))
return SQL_INVALID_HANDLE;
- clearEnvErrors((ODBCEnv *) nInputHandle);
- return SQLAllocDbc_((ODBCEnv *) nInputHandle, pnOutputHandle);
+ clearEnvErrors((ODBCEnv *) InputHandle);
+ return SQLAllocDbc_((ODBCEnv *) InputHandle, OutputHandlePtr);
case SQL_HANDLE_STMT:
- if (!isValidDbc((ODBCDbc *) nInputHandle))
+ if (!isValidDbc((ODBCDbc *) InputHandle))
return SQL_INVALID_HANDLE;
- clearDbcErrors((ODBCDbc *) nInputHandle);
- return SQLAllocStmt_((ODBCDbc *) nInputHandle, pnOutputHandle);
+ clearDbcErrors((ODBCDbc *) InputHandle);
+ return SQLAllocStmt_((ODBCDbc *) InputHandle, OutputHandlePtr);
case SQL_HANDLE_DESC:
- if (!isValidDbc((ODBCDbc *) nInputHandle))
+ if (!isValidDbc((ODBCDbc *) InputHandle))
return SQL_INVALID_HANDLE;
- clearDbcErrors((ODBCDbc *) nInputHandle);
- return SQLAllocDesc_((ODBCDbc *) nInputHandle, pnOutputHandle);
+ clearDbcErrors((ODBCDbc *) InputHandle);
+ return SQLAllocDesc_((ODBCDbc *) InputHandle, OutputHandlePtr);
default:
/* we cannot set an error because we do not know
the handle type of the possibly non-null handle */
@@ -156,13 +153,17 @@ SQLAllocHandle_(SQLSMALLINT nHandleType,
}
SQLRETURN SQL_API
-SQLAllocHandle(SQLSMALLINT nHandleType, /* type to be allocated */
- SQLHANDLE nInputHandle, /* context for new handle */
- SQLHANDLE *pnOutputHandle)
-{ /* ptr for allocated handle struct */
+SQLAllocHandle(SQLSMALLINT HandleType, /* type to be allocated */
+ SQLHANDLE InputHandle, /* context for new handle */
+ SQLHANDLE *OutputHandlePtr) /* ptr for allocated handle struct */
+{
#ifdef ODBCDEBUG
- ODBCLOG("SQLAllocHandle %s " PTRFMT "\n", nHandleType == SQL_HANDLE_ENV
? "Env" : nHandleType == SQL_HANDLE_DBC ? "Dbc" : nHandleType ==
SQL_HANDLE_STMT ? "Stmt" : "Desc", PTRFMTCAST nInputHandle);
+ ODBCLOG("SQLAllocHandle %s " PTRFMT "\n",
+ HandleType == SQL_HANDLE_ENV ? "Env" :
+ HandleType == SQL_HANDLE_DBC ? "Dbc" :
+ HandleType == SQL_HANDLE_STMT ? "Stmt" : "Desc",
+ PTRFMTCAST InputHandle);
#endif
- return SQLAllocHandle_(nHandleType, nInputHandle, pnOutputHandle);
+ return SQLAllocHandle_(HandleType, InputHandle, OutputHandlePtr);
}
diff --git a/clients/odbc/driver/SQLAllocStmt.c
b/clients/odbc/driver/SQLAllocStmt.c
--- a/clients/odbc/driver/SQLAllocStmt.c
+++ b/clients/odbc/driver/SQLAllocStmt.c
@@ -40,13 +40,14 @@
#include "ODBCGlobal.h"
SQLRETURN SQL_API
-SQLAllocStmt(SQLHDBC hDbc,
- SQLHSTMT *phStmt)
+SQLAllocStmt(SQLHDBC ConnectionHandle,
+ SQLHSTMT *OutputHandlePtr)
{
#ifdef ODBCDEBUG
- ODBCLOG("SQLAllocStmt " PTRFMT "\n", PTRFMTCAST hDbc);
+ ODBCLOG("SQLAllocStmt " PTRFMT "\n", PTRFMTCAST ConnectionHandle);
#endif
/* use mapping as described in ODBC 3 SDK Help file */
- return SQLAllocHandle_(SQL_HANDLE_STMT, (SQLHANDLE) hDbc, (SQLHANDLE *)
phStmt);
+ return SQLAllocHandle_(SQL_HANDLE_STMT, (SQLHANDLE) ConnectionHandle,
+ (SQLHANDLE *) OutputHandlePtr);
}
diff --git a/clients/odbc/driver/SQLBindCol.c b/clients/odbc/driver/SQLBindCol.c
--- a/clients/odbc/driver/SQLBindCol.c
+++ b/clients/odbc/driver/SQLBindCol.c
@@ -41,20 +41,20 @@
SQLRETURN SQL_API
-SQLBindCol(SQLHSTMT hStmt,
- SQLUSMALLINT nCol,
- SQLSMALLINT nTargetType,
- SQLPOINTER pTargetValue,
- SQLLEN nTargetValueMax,
- SQLLEN *pnLengthOrIndicator)
+SQLBindCol(SQLHSTMT StatementHandle,
+ SQLUSMALLINT ColumnNumber,
+ SQLSMALLINT TargetType,
+ SQLPOINTER TargetValuePtr,
+ SQLLEN BufferLength,
+ SQLLEN *StrLen_or_Ind)
{
- ODBCStmt *stmt = (ODBCStmt *) hStmt;
+ ODBCStmt *stmt = (ODBCStmt *) StatementHandle;
ODBCDesc *desc; /* Application Row Descriptor */
#ifdef ODBCDEBUG
ODBCLOG("SQLBindCol " PTRFMT " %d %d " LENFMT "\n",
- PTRFMTCAST hStmt, nCol, (int) nTargetType,
- LENCAST nTargetValueMax);
+ PTRFMTCAST StatementHandle, ColumnNumber, (int) TargetType,
+ LENCAST BufferLength);
#endif
if (!isValidStmt(stmt))
@@ -66,8 +66,8 @@ SQLBindCol(SQLHSTMT hStmt,
/* check input parameters */
/* column number 0 (Bookmark column) is not supported */
- if (nCol == 0) {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
