From f289c753f4b68b1a1c9325cce9b7079c037979ed Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 11 Mar 2014 13:15:55 +0200 Subject: [PATCH] More whitespace cleanup. Make whitespace and indentation more consistent in SQL_API function declarations. --- bind.c | 15 +-- connection.c | 35 +++---- descriptor.c | 26 ++--- dlg_wingui.c | 14 +-- drvconn.c | 3 +- environ.c | 49 +++++----- execute.c | 18 ++-- info.c | 242 ++++++++++++++++++++++------------------------ info30.c | 2 +- odbcapi.c | 45 +++------ odbcapi25w.c | 39 ++++---- odbcapi30.c | 14 +-- odbcapi30w.c | 102 ++++++++++---------- odbcapiw.c | 265 +++++++++++++++++++++++++++------------------------ pgapi30.c | 65 ++++++------- results.c | 58 +++++------ statement.c | 24 ++--- 17 files changed, 493 insertions(+), 523 deletions(-) diff --git a/bind.c b/bind.c index 5321abe..c75d927 100644 --- a/bind.c +++ b/bind.c @@ -31,8 +31,7 @@ /* Bind parameters on a statement handle */ RETCODE SQL_API -PGAPI_BindParameter( - HSTMT hstmt, +PGAPI_BindParameter(HSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT fParamType, SQLSMALLINT fCType, @@ -147,8 +146,7 @@ PGAPI_BindParameter( /* Associate a user-supplied buffer with a database column. */ RETCODE SQL_API -PGAPI_BindCol( - HSTMT hstmt, +PGAPI_BindCol(HSTMT hstmt, SQLUSMALLINT icol, SQLSMALLINT fCType, PTR rgbValue, @@ -309,8 +307,7 @@ cleanup: * data type (most likely varchar). */ RETCODE SQL_API -PGAPI_DescribeParam( - HSTMT hstmt, +PGAPI_DescribeParam(HSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT FAR * pfSqlType, SQLULEN FAR * pcbParamDef, @@ -420,8 +417,7 @@ cleanup: #if (ODBCVER < 0x0300) /* Sets multiple values (arrays) for the set of parameter markers. */ RETCODE SQL_API -PGAPI_ParamOptions( - HSTMT hstmt, +PGAPI_ParamOptions(HSTMT hstmt, SQLULEN crow, SQLULEN FAR * pirow) { @@ -451,8 +447,7 @@ PGAPI_ParamOptions( * If the statement does not have parameters, it should just return 0. */ RETCODE SQL_API -PGAPI_NumParams( - HSTMT hstmt, +PGAPI_NumParams(HSTMT hstmt, SQLSMALLINT FAR * pcpar) { StatementClass *stmt = (StatementClass *) hstmt; diff --git a/connection.c b/connection.c index 3b438d6..6432190 100644 --- a/connection.c +++ b/connection.c @@ -69,8 +69,7 @@ extern GLOBAL_VALUES globals; RETCODE SQL_API -PGAPI_AllocConnect( - HENV henv, +PGAPI_AllocConnect(HENV henv, HDBC FAR * phdbc) { EnvironmentClass *env = (EnvironmentClass *) henv; @@ -109,8 +108,7 @@ PGAPI_AllocConnect( RETCODE SQL_API -PGAPI_Connect( - HDBC hdbc, +PGAPI_Connect(HDBC hdbc, const SQLCHAR FAR * szDSN, SQLSMALLINT cbDSN, const SQLCHAR FAR * szUID, @@ -180,13 +178,12 @@ PGAPI_Connect( RETCODE SQL_API -PGAPI_BrowseConnect( - HDBC hdbc, - const SQLCHAR FAR * szConnStrIn, - SQLSMALLINT cbConnStrIn, - SQLCHAR FAR * szConnStrOut, - SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT FAR * pcbConnStrOut) +PGAPI_BrowseConnect(HDBC hdbc, + const SQLCHAR FAR * szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLCHAR FAR * szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT FAR * pcbConnStrOut) { CSTR func = "PGAPI_BrowseConnect"; ConnectionClass *conn = (ConnectionClass *) hdbc; @@ -200,8 +197,7 @@ PGAPI_BrowseConnect( /* Drop any hstmts open on hdbc and disconnect from database */ RETCODE SQL_API -PGAPI_Disconnect( - HDBC hdbc) +PGAPI_Disconnect(HDBC hdbc) { ConnectionClass *conn = (ConnectionClass *) hdbc; CSTR func = "PGAPI_Disconnect"; @@ -237,8 +233,7 @@ PGAPI_Disconnect( RETCODE SQL_API -PGAPI_FreeConnect( - HDBC hdbc) +PGAPI_FreeConnect(HDBC hdbc) { ConnectionClass *conn = (ConnectionClass *) hdbc; CSTR func = "PGAPI_FreeConnect"; @@ -889,10 +884,10 @@ inolog("md5 pwd=%s user=%s salt=%02x%02x%02x%02x%02x\n", PRINT_NAME(ci->password } free(pwd1); if (PROTOCOL_74(&(self->connInfo))) -{ + { inolog("putting p and %s\n", pwd2); SOCK_put_char(sock, 'p'); -} + } md5len = strlen(pwd2); SOCK_put_int(sock, (Int4) (4 + md5len + 1), 4); SOCK_put_n_char(sock, pwd2, (md5len + 1)); @@ -4231,7 +4226,7 @@ inolog("socket=%d\n", socket); sock->ssl = PQgetssl(pqconn); inolog("ssl=%p\n", sock->ssl); #endif /* USE_SSL */ -if (TRUE) + if (TRUE) { int pversion; ConnInfo *ci = &self->connInfo; @@ -4308,11 +4303,11 @@ LIBPQ_send_cancel_request(const ConnectionClass *conn) return FALSE; cancel = PQgetCancel(sock->pqconn); - if(!cancel) + if (!cancel) return FALSE; ret = PQcancel(cancel, errbuf, sizeof(errbuf)); PQfreeCancel(cancel); - if(1 == ret) + if (1 == ret) return TRUE; else return FALSE; diff --git a/descriptor.c b/descriptor.c index 2ec2506..31c2b6b 100644 --- a/descriptor.c +++ b/descriptor.c @@ -293,8 +293,9 @@ char CC_add_descriptor(ConnectionClass *self, DescriptorClass *desc) /* * This API allocates a Application descriptor. */ -RETCODE SQL_API PGAPI_AllocDesc(HDBC ConnectionHandle, - SQLHDESC *DescriptorHandle) +RETCODE SQL_API +PGAPI_AllocDesc(HDBC ConnectionHandle, + SQLHDESC *DescriptorHandle) { CSTR func = "PGAPI_AllocDesc"; ConnectionClass *conn = (ConnectionClass *) ConnectionHandle; @@ -323,7 +324,8 @@ RETCODE SQL_API PGAPI_AllocDesc(HDBC ConnectionHandle, return ret; } -RETCODE SQL_API PGAPI_FreeDesc(SQLHDESC DescriptorHandle) +RETCODE SQL_API +PGAPI_FreeDesc(SQLHDESC DescriptorHandle) { CSTR func = "PGAPI_FreeDesc"; DescriptorClass *desc = (DescriptorClass *) DescriptorHandle; @@ -428,7 +430,7 @@ static void IPDFields_copy(const IPDFields *src, IPDFields *target) RETCODE SQL_API PGAPI_CopyDesc(SQLHDESC SourceDescHandle, - SQLHDESC TargetDescHandle) + SQLHDESC TargetDescHandle) { CSTR func = "PGAPI_CopyDesc"; RETCODE ret = SQL_ERROR; @@ -633,14 +635,14 @@ DC_log_error(const char *func, const char *desc, const DescriptorClass *self) /* Returns the next SQL error information. */ RETCODE SQL_API -PGAPI_DescError( SQLHDESC hdesc, - SQLSMALLINT RecNumber, - SQLCHAR FAR * szSqlState, - SQLINTEGER FAR * pfNativeError, - SQLCHAR FAR * szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT FAR * pcbErrorMsg, - UWORD flag) +PGAPI_DescError(SQLHDESC hdesc, + SQLSMALLINT RecNumber, + SQLCHAR FAR * szSqlState, + SQLINTEGER FAR * pfNativeError, + SQLCHAR FAR * szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT FAR * pcbErrorMsg, + UWORD flag) { CSTR func = "PGAPI_DescError"; /* CC: return an error of a hdesc */ diff --git a/dlg_wingui.c b/dlg_wingui.c index 90e3bf6..fd41992 100644 --- a/dlg_wingui.c +++ b/dlg_wingui.c @@ -733,17 +733,17 @@ makeDriversList(HWND lwnd, const ConnInfo *ci) do { ret = SQLDrivers(henv, direction, - drvname, sizeof(drvname), &drvncount, - drvatt, sizeof(drvatt), &drvacount); + drvname, sizeof(drvname), &drvncount, + drvatt, sizeof(drvatt), &drvacount); if (SQL_SUCCESS != ret && SQL_SUCCESS_WITH_INFO != ret) break; if (strnicmp(drvname, "postgresql", 10) == 0) { iidx = SendMessage(lwnd, LB_ADDSTRING, 0, (LPARAM) drvname); if (LB_ERR != iidx && stricmp(drvname, ci->drivername) == 0) -{ + { SendMessage(lwnd, LB_SETCURSEL, (WPARAM) iidx, (LPARAM) 0); -} + } lcount++; } direction = SQL_FETCH_NEXT; @@ -757,7 +757,7 @@ makeDriversList(HWND lwnd, const ConnInfo *ci) LRESULT CALLBACK manage_dsnProc(HWND hdlg, UINT wMsg, - WPARAM wParam, LPARAM lParam) + WPARAM wParam, LPARAM lParam) { LPSETUPDLG lpsetupdlg; ConnInfo *ci; @@ -782,11 +782,11 @@ manage_dsnProc(HWND hdlg, UINT wMsg, lpsetupdlg = (LPSETUPDLG) GetWindowLongPtr(hdlg, DWLP_USER); lwnd = GetDlgItem(hdlg, IDC_DRIVER_LIST); sidx = SendMessage(lwnd, LB_GETCURSEL, - (WPARAM) 0, (LPARAM) 0); + (WPARAM) 0, (LPARAM) 0); if (LB_ERR == sidx) return FALSE; sidx = SendMessage(lwnd, LB_GETTEXT, - (WPARAM) sidx, (LPARAM) drvname); + (WPARAM) sidx, (LPARAM) drvname); if (LB_ERR == sidx) return FALSE; ChangeDriverName(hdlg, lpsetupdlg, drvname); diff --git a/drvconn.c b/drvconn.c index 99ddb36..dcbe9b0 100644 --- a/drvconn.c +++ b/drvconn.c @@ -74,8 +74,7 @@ extern HINSTANCE NEAR s_hModule; /* Saved module handle. */ RETCODE SQL_API -PGAPI_DriverConnect( - HDBC hdbc, +PGAPI_DriverConnect(HDBC hdbc, HWND hwnd, const SQLCHAR FAR * szConnStrIn, SQLSMALLINT cbConnStrIn, diff --git a/environ.c b/environ.c index 3e8c9f7..cd3c6d4 100644 --- a/environ.c +++ b/environ.c @@ -181,13 +181,13 @@ PG_ErrorInfo *ER_Dup(const PG_ErrorInfo *self) /* Returns the next SQL error information. */ RETCODE SQL_API ER_ReturnError(PG_ErrorInfo **pgerror, - SQLSMALLINT RecNumber, - SQLCHAR FAR * szSqlState, - SQLINTEGER FAR * pfNativeError, - SQLCHAR FAR * szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT FAR * pcbErrorMsg, - UWORD flag) + SQLSMALLINT RecNumber, + SQLCHAR FAR * szSqlState, + SQLINTEGER FAR * pfNativeError, + SQLCHAR FAR * szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT FAR * pcbErrorMsg, + UWORD flag) { CSTR func = "ER_ReturnError"; /* CC: return an error of a hstmt */ @@ -274,14 +274,14 @@ ER_ReturnError(PG_ErrorInfo **pgerror, RETCODE SQL_API -PGAPI_ConnectError( HDBC hdbc, - SQLSMALLINT RecNumber, - SQLCHAR FAR * szSqlState, - SQLINTEGER FAR * pfNativeError, - SQLCHAR FAR * szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT FAR * pcbErrorMsg, - UWORD flag) +PGAPI_ConnectError(HDBC hdbc, + SQLSMALLINT RecNumber, + SQLCHAR FAR * szSqlState, + SQLINTEGER FAR * pfNativeError, + SQLCHAR FAR * szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT FAR * pcbErrorMsg, + UWORD flag) { ConnectionClass *conn = (ConnectionClass *) hdbc; EnvironmentClass *env = (EnvironmentClass *) conn->henv; @@ -408,14 +408,14 @@ PGAPI_ConnectError( HDBC hdbc, } RETCODE SQL_API -PGAPI_EnvError( HENV henv, - SQLSMALLINT RecNumber, - SQLCHAR FAR * szSqlState, - SQLINTEGER FAR * pfNativeError, - SQLCHAR FAR * szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT FAR * pcbErrorMsg, - UWORD flag) +PGAPI_EnvError(HENV henv, + SQLSMALLINT RecNumber, + SQLCHAR FAR * szSqlState, + SQLINTEGER FAR * pfNativeError, + SQLCHAR FAR * szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT FAR * pcbErrorMsg, + UWORD flag) { EnvironmentClass *env = (EnvironmentClass *) henv; char *msg; @@ -469,8 +469,7 @@ PGAPI_EnvError( HENV henv, /* Returns the next SQL error information. */ RETCODE SQL_API -PGAPI_Error( - HENV henv, +PGAPI_Error(HENV henv, HDBC hdbc, HSTMT hstmt, SQLCHAR FAR * szSqlState, diff --git a/execute.c b/execute.c index 130287b..1cc4f04 100644 --- a/execute.c +++ b/execute.c @@ -146,8 +146,7 @@ inolog("SQLPrepare return=%d\n", retval); /* Performs the equivalent of SQLPrepare, followed by SQLExecute. */ RETCODE SQL_API -PGAPI_ExecDirect( - HSTMT hstmt, +PGAPI_ExecDirect(HSTMT hstmt, const SQLCHAR FAR * szSqlStr, SQLINTEGER cbSqlStr, UWORD flag) @@ -1177,8 +1176,7 @@ mylog("retval=%d\n", retval); RETCODE SQL_API -PGAPI_Transact( - HENV henv, +PGAPI_Transact(HENV henv, HDBC hdbc, SQLUSMALLINT fType) { @@ -1242,8 +1240,7 @@ PGAPI_Transact( RETCODE SQL_API -PGAPI_Cancel( - HSTMT hstmt) /* Statement to cancel. */ +PGAPI_Cancel(HSTMT hstmt) /* Statement to cancel. */ { CSTR func = "PGAPI_Cancel"; StatementClass *stmt = (StatementClass *) hstmt, *estmt; @@ -1356,8 +1353,7 @@ cleanup: * observing buffer limits and truncation. */ RETCODE SQL_API -PGAPI_NativeSql( - HDBC hdbc, +PGAPI_NativeSql(HDBC hdbc, const SQLCHAR FAR * szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR FAR * szSqlStr, @@ -1408,8 +1404,7 @@ PGAPI_NativeSql( * Used in conjuction with SQLPutData. */ RETCODE SQL_API -PGAPI_ParamData( - HSTMT hstmt, +PGAPI_ParamData(HSTMT hstmt, PTR FAR * prgbValue) { CSTR func = "PGAPI_ParamData"; @@ -1558,8 +1553,7 @@ cleanup: * Used in conjunction with SQLParamData. */ RETCODE SQL_API -PGAPI_PutData( - HSTMT hstmt, +PGAPI_PutData(HSTMT hstmt, PTR rgbValue, SQLLEN cbValue) { diff --git a/info.c b/info.c index 6e59f8e..81bfe6d 100644 --- a/info.c +++ b/info.c @@ -55,8 +55,7 @@ static const char *likeop = "like"; static const char *eqop = "="; RETCODE SQL_API -PGAPI_GetInfo( - HDBC hdbc, +PGAPI_GetInfo(HDBC hdbc, SQLUSMALLINT fInfoType, PTR rgbInfoValue, SQLSMALLINT cbInfoValueMax, @@ -831,8 +830,7 @@ cleanup: RETCODE SQL_API -PGAPI_GetTypeInfo( - HSTMT hstmt, +PGAPI_GetTypeInfo(HSTMT hstmt, SQLSMALLINT fSqlType) { CSTR func = "PGAPI_GetTypeInfo"; @@ -995,8 +993,7 @@ cleanup: RETCODE SQL_API -PGAPI_GetFunctions( - HDBC hdbc, +PGAPI_GetFunctions(HDBC hdbc, SQLUSMALLINT fFunction, SQLUSMALLINT FAR * pfExists) { @@ -1512,8 +1509,7 @@ allow_public_schema(ConnectionClass *conn, const SQLCHAR *szSchemaName, SQLSMALL } RETCODE SQL_API -PGAPI_Tables( - HSTMT hstmt, +PGAPI_Tables(HSTMT hstmt, const SQLCHAR FAR * szTableQualifier, /* PV X*/ SQLSMALLINT cbTableQualifier, const SQLCHAR FAR * szTableOwner, /* PV E*/ @@ -1993,8 +1989,7 @@ cleanup: } RETCODE SQL_API -PGAPI_Columns( - HSTMT hstmt, +PGAPI_Columns(HSTMT hstmt, const SQLCHAR FAR * szTableQualifier, /* OA X*/ SQLSMALLINT cbTableQualifier, const SQLCHAR FAR * szTableOwner, /* PV E*/ @@ -2749,17 +2744,16 @@ cleanup: RETCODE SQL_API -PGAPI_SpecialColumns( - HSTMT hstmt, - SQLUSMALLINT fColType, - const SQLCHAR FAR * szTableQualifier, - SQLSMALLINT cbTableQualifier, - const SQLCHAR FAR * szTableOwner, /* OA E*/ - SQLSMALLINT cbTableOwner, - const SQLCHAR FAR * szTableName, /* OA(R) E*/ - SQLSMALLINT cbTableName, - SQLUSMALLINT fScope, - SQLUSMALLINT fNullable) +PGAPI_SpecialColumns(HSTMT hstmt, + SQLUSMALLINT fColType, + const SQLCHAR FAR * szTableQualifier, + SQLSMALLINT cbTableQualifier, + const SQLCHAR FAR * szTableOwner, /* OA E*/ + SQLSMALLINT cbTableOwner, + const SQLCHAR FAR * szTableName, /* OA(R) E*/ + SQLSMALLINT cbTableName, + SQLUSMALLINT fScope, + SQLUSMALLINT fNullable) { CSTR func = "PGAPI_SpecialColumns"; TupleField *tuple; @@ -3004,16 +2998,15 @@ cleanup: #define INDOPTION_DESC 0x0001 /* values are in reverse order */ RETCODE SQL_API -PGAPI_Statistics( - HSTMT hstmt, - const SQLCHAR FAR * szTableQualifier, /* OA X*/ - SQLSMALLINT cbTableQualifier, - const SQLCHAR FAR * szTableOwner, /* OA E*/ - SQLSMALLINT cbTableOwner, - const SQLCHAR FAR * szTableName, /* OA(R) E*/ - SQLSMALLINT cbTableName, - SQLUSMALLINT fUnique, - SQLUSMALLINT fAccuracy) +PGAPI_Statistics(HSTMT hstmt, + const SQLCHAR FAR * szTableQualifier, /* OA X*/ + SQLSMALLINT cbTableQualifier, + const SQLCHAR FAR * szTableOwner, /* OA E*/ + SQLSMALLINT cbTableOwner, + const SQLCHAR FAR * szTableName, /* OA(R) E*/ + SQLSMALLINT cbTableName, + SQLUSMALLINT fUnique, + SQLUSMALLINT fAccuracy) { CSTR func = "PGAPI_Statistics"; StatementClass *stmt = (StatementClass *) hstmt; @@ -3529,17 +3522,16 @@ cleanup: RETCODE SQL_API -PGAPI_ColumnPrivileges( - HSTMT hstmt, - const SQLCHAR FAR * szTableQualifier, /* OA X*/ - SQLSMALLINT cbTableQualifier, - const SQLCHAR FAR * szTableOwner, /* OA E*/ - SQLSMALLINT cbTableOwner, - const SQLCHAR FAR * szTableName, /* OA(R) E*/ - SQLSMALLINT cbTableName, - const SQLCHAR FAR * szColumnName, /* PV E*/ - SQLSMALLINT cbColumnName, - UWORD flag) +PGAPI_ColumnPrivileges(HSTMT hstmt, + const SQLCHAR FAR * szTableQualifier, /* OA X*/ + SQLSMALLINT cbTableQualifier, + const SQLCHAR FAR * szTableOwner, /* OA E*/ + SQLSMALLINT cbTableOwner, + const SQLCHAR FAR * szTableName, /* OA(R) E*/ + SQLSMALLINT cbTableName, + const SQLCHAR FAR * szColumnName, /* PV E*/ + SQLSMALLINT cbColumnName, + UWORD flag) { CSTR func = "PGAPI_ColumnPrivileges"; StatementClass *stmt = (StatementClass *) hstmt; @@ -3641,15 +3633,14 @@ cleanup: * Retrieve the primary key columns for the specified table. */ RETCODE SQL_API -PGAPI_PrimaryKeys( - HSTMT hstmt, - const SQLCHAR FAR * szTableQualifier, /* OA X*/ - SQLSMALLINT cbTableQualifier, - const SQLCHAR FAR * szTableOwner, /* OA E*/ - SQLSMALLINT cbTableOwner, - const SQLCHAR FAR * szTableName, /* OA(R) E*/ - SQLSMALLINT cbTableName, - OID reloid) +PGAPI_PrimaryKeys(HSTMT hstmt, + const SQLCHAR FAR * szTableQualifier, /* OA X*/ + SQLSMALLINT cbTableQualifier, + const SQLCHAR FAR * szTableOwner, /* OA E*/ + SQLSMALLINT cbTableOwner, + const SQLCHAR FAR * szTableName, /* OA(R) E*/ + SQLSMALLINT cbTableName, + OID reloid) { CSTR func = "PGAPI_PrimaryKeys"; StatementClass *stmt = (StatementClass *) hstmt; @@ -4081,36 +4072,34 @@ getClientColumnName(ConnectionClass *conn, UInt4 relid, char *serverColumnName, } static RETCODE SQL_API -PGAPI_ForeignKeys_new( - HSTMT hstmt, - const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ - SQLSMALLINT cbPkTableQualifier, - const SQLCHAR FAR * szPkTableOwner, /* OA E*/ - SQLSMALLINT cbPkTableOwner, - const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ - SQLSMALLINT cbPkTableName, - const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ - SQLSMALLINT cbFkTableQualifier, - const SQLCHAR FAR * szFkTableOwner, /* OA E*/ - SQLSMALLINT cbFkTableOwner, - const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ - SQLSMALLINT cbFkTableName); +PGAPI_ForeignKeys_new(HSTMT hstmt, + const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ + SQLSMALLINT cbPkTableQualifier, + const SQLCHAR FAR * szPkTableOwner, /* OA E*/ + SQLSMALLINT cbPkTableOwner, + const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ + SQLSMALLINT cbPkTableName, + const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ + SQLSMALLINT cbFkTableQualifier, + const SQLCHAR FAR * szFkTableOwner, /* OA E*/ + SQLSMALLINT cbFkTableOwner, + const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ + SQLSMALLINT cbFkTableName); static RETCODE SQL_API -PGAPI_ForeignKeys_old( - HSTMT hstmt, - const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ - SQLSMALLINT cbPkTableQualifier, - const SQLCHAR FAR * szPkTableOwner, /* OA E*/ - SQLSMALLINT cbPkTableOwner, - const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ - SQLSMALLINT cbPkTableName, - const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ - SQLSMALLINT cbFkTableQualifier, - const SQLCHAR FAR * szFkTableOwner, /* OA E*/ - SQLSMALLINT cbFkTableOwner, - const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ - SQLSMALLINT cbFkTableName) +PGAPI_ForeignKeys_old(HSTMT hstmt, + const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ + SQLSMALLINT cbPkTableQualifier, + const SQLCHAR FAR * szPkTableOwner, /* OA E*/ + SQLSMALLINT cbPkTableOwner, + const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ + SQLSMALLINT cbPkTableName, + const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ + SQLSMALLINT cbFkTableQualifier, + const SQLCHAR FAR * szFkTableOwner, /* OA E*/ + SQLSMALLINT cbFkTableOwner, + const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ + SQLSMALLINT cbFkTableName) { CSTR func = "PGAPI_ForeignKeys"; StatementClass *stmt = (StatementClass *) hstmt; @@ -4986,20 +4975,19 @@ cleanup: } RETCODE SQL_API -PGAPI_ForeignKeys( - HSTMT hstmt, - const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ - SQLSMALLINT cbPkTableQualifier, - const SQLCHAR FAR * szPkTableOwner, /* OA E*/ - SQLSMALLINT cbPkTableOwner, - const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ - SQLSMALLINT cbPkTableName, - const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ - SQLSMALLINT cbFkTableQualifier, - const SQLCHAR FAR * szFkTableOwner, /* OA E*/ - SQLSMALLINT cbFkTableOwner, - const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ - SQLSMALLINT cbFkTableName) +PGAPI_ForeignKeys(HSTMT hstmt, + const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ + SQLSMALLINT cbPkTableQualifier, + const SQLCHAR FAR * szPkTableOwner, /* OA E*/ + SQLSMALLINT cbPkTableOwner, + const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ + SQLSMALLINT cbPkTableName, + const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ + SQLSMALLINT cbFkTableQualifier, + const SQLCHAR FAR * szFkTableOwner, /* OA E*/ + SQLSMALLINT cbFkTableOwner, + const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ + SQLSMALLINT cbFkTableName) { ConnectionClass *conn = SC_get_conn(((StatementClass *) hstmt)); if (PG_VERSION_GE(conn, 8.1)) @@ -5024,17 +5012,16 @@ PGAPI_ForeignKeys( #define PRORET_COUNT #define DISPLAY_ARGNAME RETCODE SQL_API -PGAPI_ProcedureColumns( - HSTMT hstmt, - const SQLCHAR FAR * szProcQualifier, /* OA X*/ - SQLSMALLINT cbProcQualifier, - const SQLCHAR FAR * szProcOwner, /* PV E*/ - SQLSMALLINT cbProcOwner, - const SQLCHAR FAR * szProcName, /* PV E*/ - SQLSMALLINT cbProcName, - const SQLCHAR FAR * szColumnName, /* PV X*/ - SQLSMALLINT cbColumnName, - UWORD flag) +PGAPI_ProcedureColumns(HSTMT hstmt, + const SQLCHAR FAR * szProcQualifier, /* OA X*/ + SQLSMALLINT cbProcQualifier, + const SQLCHAR FAR * szProcOwner, /* PV E*/ + SQLSMALLINT cbProcOwner, + const SQLCHAR FAR * szProcName, /* PV E*/ + SQLSMALLINT cbProcName, + const SQLCHAR FAR * szColumnName, /* PV X*/ + SQLSMALLINT cbColumnName, + UWORD flag) { CSTR func = "PGAPI_ProcedureColumns"; StatementClass *stmt = (StatementClass *) hstmt; @@ -5442,8 +5429,7 @@ mylog("atttypid=%s\n", atttypid ? atttypid : "(null)"); RETCODE SQL_API -PGAPI_Procedures( - HSTMT hstmt, +PGAPI_Procedures(HSTMT hstmt, const SQLCHAR FAR * szProcQualifier, /* OA X*/ SQLSMALLINT cbProcQualifier, const SQLCHAR FAR * szProcOwner, /* PV E*/ @@ -5592,15 +5578,14 @@ mylog("user=%s auth=%s\n", user, auth); } RETCODE SQL_API -PGAPI_TablePrivileges( - HSTMT hstmt, - const SQLCHAR FAR * szTableQualifier, /* OA X*/ - SQLSMALLINT cbTableQualifier, - const SQLCHAR FAR * szTableOwner, /* PV E*/ - SQLSMALLINT cbTableOwner, - const SQLCHAR FAR * szTableName, /* PV E*/ - SQLSMALLINT cbTableName, - UWORD flag) +PGAPI_TablePrivileges(HSTMT hstmt, + const SQLCHAR FAR * szTableQualifier, /* OA X*/ + SQLSMALLINT cbTableQualifier, + const SQLCHAR FAR * szTableOwner, /* PV E*/ + SQLSMALLINT cbTableOwner, + const SQLCHAR FAR * szTableName, /* PV E*/ + SQLSMALLINT cbTableName, + UWORD flag) { StatementClass *stmt = (StatementClass *) hstmt; CSTR func = "PGAPI_TablePrivileges"; @@ -5883,20 +5868,19 @@ cleanup: static RETCODE SQL_API -PGAPI_ForeignKeys_new( - HSTMT hstmt, - const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ - SQLSMALLINT cbPkTableQualifier, - const SQLCHAR FAR * szPkTableOwner, /* OA E*/ - SQLSMALLINT cbPkTableOwner, - const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ - SQLSMALLINT cbPkTableName, - const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ - SQLSMALLINT cbFkTableQualifier, - const SQLCHAR FAR * szFkTableOwner, /* OA E*/ - SQLSMALLINT cbFkTableOwner, - const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ - SQLSMALLINT cbFkTableName) +PGAPI_ForeignKeys_new(HSTMT hstmt, + const SQLCHAR FAR * szPkTableQualifier, /* OA X*/ + SQLSMALLINT cbPkTableQualifier, + const SQLCHAR FAR * szPkTableOwner, /* OA E*/ + SQLSMALLINT cbPkTableOwner, + const SQLCHAR FAR * szPkTableName, /* OA(R) E*/ + SQLSMALLINT cbPkTableName, + const SQLCHAR FAR * szFkTableQualifier, /* OA X*/ + SQLSMALLINT cbFkTableQualifier, + const SQLCHAR FAR * szFkTableOwner, /* OA E*/ + SQLSMALLINT cbFkTableOwner, + const SQLCHAR FAR * szFkTableName, /* OA(R) E*/ + SQLSMALLINT cbFkTableName) { CSTR func = "PGAPI_ForeignKeys"; StatementClass *stmt = (StatementClass *) hstmt; diff --git a/info30.c b/info30.c index 987cd7e..ced79c0 100644 --- a/info30.c +++ b/info30.c @@ -15,7 +15,7 @@ RETCODE SQL_API PGAPI_GetInfo30(HDBC hdbc, SQLUSMALLINT fInfoType, PTR rgbInfoValue, - SQLSMALLINT cbInfoValueMax, SQLSMALLINT FAR * pcbInfoValue) + SQLSMALLINT cbInfoValueMax, SQLSMALLINT FAR * pcbInfoValue) { CSTR func = "PGAPI_GetInfo30"; ConnectionClass *conn = (ConnectionClass *) hdbc; diff --git a/odbcapi.c b/odbcapi.c index 954a1d0..b5b5aac 100644 --- a/odbcapi.c +++ b/odbcapi.c @@ -241,8 +241,7 @@ SQLDriverConnect(HDBC hdbc, return ret; } RETCODE SQL_API -SQLBrowseConnect( - HDBC hdbc, +SQLBrowseConnect(HDBC hdbc, SQLCHAR *szConnStrIn, SQLSMALLINT cbConnStrIn, SQLCHAR *szConnStrOut, @@ -1025,8 +1024,7 @@ SQLTransact(HENV EnvironmentHandle, } RETCODE SQL_API -SQLColAttributes( - HSTMT hstmt, +SQLColAttributes(HSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, PTR rgbDesc, @@ -1050,8 +1048,7 @@ SQLColAttributes( #endif /* ODBCVER */ RETCODE SQL_API -SQLColumnPrivileges( - HSTMT hstmt, +SQLColumnPrivileges(HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName, @@ -1131,8 +1128,7 @@ SQLColumnPrivileges( } RETCODE SQL_API -SQLDescribeParam( - HSTMT hstmt, +SQLDescribeParam(HSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT *pfSqlType, SQLULEN *pcbParamDef, @@ -1154,8 +1150,7 @@ SQLDescribeParam( } RETCODE SQL_API -SQLExtendedFetch( - HSTMT hstmt, +SQLExtendedFetch(HSTMT hstmt, SQLUSMALLINT fFetchType, SQLLEN irow, #if defined(WITH_UNIXODBC) && (SIZEOF_LONG != 8) @@ -1190,8 +1185,7 @@ SQLExtendedFetch( } RETCODE SQL_API -SQLForeignKeys( - HSTMT hstmt, +SQLForeignKeys(HSTMT hstmt, SQLCHAR *szPkCatalogName, SQLSMALLINT cbPkCatalogName, SQLCHAR *szPkSchemaName, @@ -1304,8 +1298,7 @@ SQLMoreResults(HSTMT hstmt) } RETCODE SQL_API -SQLNativeSql( - HDBC hdbc, +SQLNativeSql(HDBC hdbc, SQLCHAR *szSqlStrIn, SQLINTEGER cbSqlStrIn, SQLCHAR *szSqlStr, @@ -1326,8 +1319,7 @@ SQLNativeSql( } RETCODE SQL_API -SQLNumParams( - HSTMT hstmt, +SQLNumParams(HSTMT hstmt, SQLSMALLINT *pcpar) { RETCODE ret; @@ -1345,8 +1337,7 @@ SQLNumParams( #if (ODBCVER < 0x0300) RETCODE SQL_API -SQLParamOptions( - HSTMT hstmt, +SQLParamOptions(HSTMT hstmt, SQLULEN crow, SQLULEN *pirow) { @@ -1365,8 +1356,7 @@ SQLParamOptions( #endif /* ODBCVER */ RETCODE SQL_API -SQLPrimaryKeys( - HSTMT hstmt, +SQLPrimaryKeys(HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName, @@ -1430,8 +1420,7 @@ SQLPrimaryKeys( } RETCODE SQL_API -SQLProcedureColumns( - HSTMT hstmt, +SQLProcedureColumns(HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName, @@ -1511,8 +1500,7 @@ SQLProcedureColumns( } RETCODE SQL_API -SQLProcedures( - HSTMT hstmt, +SQLProcedures(HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName, @@ -1582,8 +1570,7 @@ SQLProcedures( } RETCODE SQL_API -SQLSetPos( - HSTMT hstmt, +SQLSetPos(HSTMT hstmt, SQLSETPOSIROW irow, SQLUSMALLINT fOption, SQLUSMALLINT fLock) @@ -1602,8 +1589,7 @@ SQLSetPos( } RETCODE SQL_API -SQLTablePrivileges( - HSTMT hstmt, +SQLTablePrivileges(HSTMT hstmt, SQLCHAR *szCatalogName, SQLSMALLINT cbCatalogName, SQLCHAR *szSchemaName, @@ -1672,8 +1658,7 @@ SQLTablePrivileges( } RETCODE SQL_API -SQLBindParameter( - HSTMT hstmt, +SQLBindParameter(HSTMT hstmt, SQLUSMALLINT ipar, SQLSMALLINT fParamType, SQLSMALLINT fCType, diff --git a/odbcapi25w.c b/odbcapi25w.c index 02f3793..ca7a23c 100644 --- a/odbcapi25w.c +++ b/odbcapi25w.c @@ -18,11 +18,12 @@ #include "connection.h" #include "statement.h" -RETCODE SQL_API SQLErrorW(HENV EnvironmentHandle, - HDBC ConnectionHandle, HSTMT StatementHandle, - SQLWCHAR *Sqlstate, SQLINTEGER *NativeError, - SQLWCHAR *MessageText, SQLSMALLINT BufferLength, - SQLSMALLINT *TextLength) +RETCODE SQL_API +SQLErrorW(HENV EnvironmentHandle, + HDBC ConnectionHandle, HSTMT StatementHandle, + SQLWCHAR *Sqlstate, SQLINTEGER *NativeError, + SQLWCHAR *MessageText, SQLSMALLINT BufferLength, + SQLSMALLINT *TextLength) { RETCODE ret; SWORD tlen, buflen; @@ -53,16 +54,18 @@ RETCODE SQL_API SQLErrorW(HENV EnvironmentHandle, return ret; } -RETCODE SQL_API SQLGetConnectOptionW(HDBC ConnectionHandle, - SQLUSMALLINT Option, PTR Value) +RETCODE SQL_API +SQLGetConnectOptionW(HDBC ConnectionHandle, + SQLUSMALLINT Option, PTR Value) { mylog("[SQLGetConnectOptionW]"); CC_set_in_unicode_driver((ConnectionClass *) ConnectionHandle); return PGAPI_GetConnectOption(ConnectionHandle, Option, Value, NULL, 64); } -RETCODE SQL_API SQLSetConnectOptionW(HDBC ConnectionHandle, - SQLUSMALLINT Option, SQLUINTEGER Value) +RETCODE SQL_API +SQLSetConnectOptionW(HDBC ConnectionHandle, + SQLUSMALLINT Option, SQLUINTEGER Value) { mylog("[SQLSetConnectionOptionW]"); if (!ConnectionHandle) return SQL_ERROR; @@ -70,16 +73,16 @@ if (!ConnectionHandle) return SQL_ERROR; return PGAPI_SetConnectOption(ConnectionHandle, Option, Value); } -RETCODE SQL_API SQLColAttributesW( - HSTMT hstmt, - SQLUSMALLINT icol, - SQLUSMALLINT fDescType, - PTR rgbDesc, - SQLSMALLINT cbDescMax, - SQLSMALLINT *pcbDesc, - SQLINTEGER *pfDesc) +RETCODE SQL_API +SQLColAttributesW(HSTMT hstmt, + SQLUSMALLINT icol, + SQLUSMALLINT fDescType, + PTR rgbDesc, + SQLSMALLINT cbDescMax, + SQLSMALLINT *pcbDesc, + SQLINTEGER *pfDesc) { mylog("[SQLColAttributesW]"); return PGAPI_ColAttributes(hstmt, icol, fDescType, rgbDesc, - cbDescMax, pcbDesc, pfDesc); + cbDescMax, pcbDesc, pfDesc); } diff --git a/odbcapi30.c b/odbcapi30.c index 54edc1f..ccadaf3 100644 --- a/odbcapi30.c +++ b/odbcapi30.c @@ -116,15 +116,15 @@ SQLCloseCursor(HSTMT StatementHandle) /* SQLColAttributes -> SQLColAttribute */ SQLRETURN SQL_API SQLColAttribute(SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLUSMALLINT FieldIdentifier, - SQLPOINTER CharacterAttribute, - SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength, + SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttribute, + SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, #if defined(_WIN64) || defined(SQLCOLATTRIBUTE_SQLLEN) - SQLLEN *NumericAttribute + SQLLEN *NumericAttribute #else - SQLPOINTER NumericAttribute + SQLPOINTER NumericAttribute #endif ) { diff --git a/odbcapi30w.c b/odbcapi30w.c index 95bbd48..c5d7f85 100644 --- a/odbcapi30w.c +++ b/odbcapi30w.c @@ -23,11 +23,12 @@ #include "statement.h" -RETCODE SQL_API SQLGetStmtAttrW(SQLHSTMT hstmt, - SQLINTEGER fAttribute, - PTR rgbValue, - SQLINTEGER cbValueMax, - SQLINTEGER *pcbValue) +RETCODE SQL_API +SQLGetStmtAttrW(SQLHSTMT hstmt, + SQLINTEGER fAttribute, + PTR rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue) { CSTR func = "SQLGetStmtAttrW"; RETCODE ret; @@ -44,10 +45,11 @@ RETCODE SQL_API SQLGetStmtAttrW(SQLHSTMT hstmt, return ret; } -RETCODE SQL_API SQLSetStmtAttrW(SQLHSTMT hstmt, - SQLINTEGER fAttribute, - PTR rgbValue, - SQLINTEGER cbValueMax) +RETCODE SQL_API +SQLSetStmtAttrW(SQLHSTMT hstmt, + SQLINTEGER fAttribute, + PTR rgbValue, + SQLINTEGER cbValueMax) { CSTR func = "SQLSetStmtAttrW"; RETCODE ret; @@ -64,11 +66,12 @@ RETCODE SQL_API SQLSetStmtAttrW(SQLHSTMT hstmt, return ret; } -RETCODE SQL_API SQLGetConnectAttrW(HDBC hdbc, - SQLINTEGER fAttribute, - PTR rgbValue, - SQLINTEGER cbValueMax, - SQLINTEGER *pcbValue) +RETCODE SQL_API +SQLGetConnectAttrW(HDBC hdbc, + SQLINTEGER fAttribute, + PTR rgbValue, + SQLINTEGER cbValueMax, + SQLINTEGER *pcbValue) { CSTR func = "SQLGetConnectAttrW"; RETCODE ret; @@ -83,10 +86,11 @@ RETCODE SQL_API SQLGetConnectAttrW(HDBC hdbc, return ret; } -RETCODE SQL_API SQLSetConnectAttrW(HDBC hdbc, - SQLINTEGER fAttribute, - PTR rgbValue, - SQLINTEGER cbValue) +RETCODE SQL_API +SQLSetConnectAttrW(HDBC hdbc, + SQLINTEGER fAttribute, + PTR rgbValue, + SQLINTEGER cbValue) { CSTR func = "SQLSetConnectAttrW"; RETCODE ret; @@ -106,8 +110,8 @@ RETCODE SQL_API SQLSetConnectAttrW(HDBC hdbc, /* new function */ RETCODE SQL_API SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, - SQLINTEGER BufferLength) + SQLSMALLINT FieldIdentifier, PTR Value, + SQLINTEGER BufferLength) { CSTR func = "SQLSetDescFieldW"; RETCODE ret; @@ -147,6 +151,7 @@ SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, free(uval); return ret; } + RETCODE SQL_API SQLGetDescFieldW(SQLHDESC hdesc, SQLSMALLINT iRecord, SQLSMALLINT iField, PTR rgbValue, SQLINTEGER cbValueMax, @@ -205,14 +210,15 @@ SQLGetDescFieldW(SQLHDESC hdesc, SQLSMALLINT iRecord, SQLSMALLINT iField, return ret; } -RETCODE SQL_API SQLGetDiagRecW(SQLSMALLINT fHandleType, - SQLHANDLE handle, - SQLSMALLINT iRecord, - SQLWCHAR *szSqlState, - SQLINTEGER *pfNativeError, - SQLWCHAR *szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT *pcbErrorMsg) +RETCODE SQL_API +SQLGetDiagRecW(SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLWCHAR *szSqlState, + SQLINTEGER *pfNativeError, + SQLWCHAR *szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT *pcbErrorMsg) { CSTR func = "SQLGetDiagRecW"; RETCODE ret; @@ -257,17 +263,17 @@ RETCODE SQL_API SQLGetDiagRecW(SQLSMALLINT fHandleType, return ret; } -SQLRETURN SQL_API SQLColAttributeW( - SQLHSTMT hstmt, - SQLUSMALLINT iCol, - SQLUSMALLINT iField, - SQLPOINTER pCharAttr, - SQLSMALLINT cbCharAttrMax, - SQLSMALLINT *pcbCharAttr, +SQLRETURN SQL_API +SQLColAttributeW(SQLHSTMT hstmt, + SQLUSMALLINT iCol, + SQLUSMALLINT iField, + SQLPOINTER pCharAttr, + SQLSMALLINT cbCharAttrMax, + SQLSMALLINT *pcbCharAttr, #if defined(_WIN64) || defined(SQLCOLATTRIBUTE_SQLLEN) - SQLLEN *pNumAttr + SQLLEN *pNumAttr #else - SQLPOINTER pNumAttr + SQLPOINTER pNumAttr #endif ) { @@ -333,19 +339,19 @@ SQLRETURN SQL_API SQLColAttributeW( return ret; } -RETCODE SQL_API SQLGetDiagFieldW( - SQLSMALLINT fHandleType, - SQLHANDLE handle, - SQLSMALLINT iRecord, - SQLSMALLINT fDiagField, - SQLPOINTER rgbDiagInfo, - SQLSMALLINT cbDiagInfoMax, - SQLSMALLINT *pcbDiagInfo) +RETCODE SQL_API +SQLGetDiagFieldW(SQLSMALLINT fHandleType, + SQLHANDLE handle, + SQLSMALLINT iRecord, + SQLSMALLINT fDiagField, + SQLPOINTER rgbDiagInfo, + SQLSMALLINT cbDiagInfoMax, + SQLSMALLINT *pcbDiagInfo) { - CSTR func = "SQLGetDiagFieldW"; - RETCODE ret; + CSTR func = "SQLGetDiagFieldW"; + RETCODE ret; SQLSMALLINT *rgbL, blen = 0, bMax; - char *rgbD = NULL; + char *rgbD = NULL; mylog("[[%s]] Handle=(%u,%p) Rec=%d Id=%d info=(%p,%d)\n", func, fHandleType, handle, iRecord, fDiagField, rgbDiagInfo, cbDiagInfoMax); diff --git a/odbcapiw.c b/odbcapiw.c index cd1bb4d..a7a0980 100644 --- a/odbcapiw.c +++ b/odbcapiw.c @@ -25,11 +25,12 @@ #include "connection.h" #include "statement.h" -RETCODE SQL_API SQLColumnsW(HSTMT StatementHandle, - SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLWCHAR *TableName, SQLSMALLINT NameLength3, - SQLWCHAR *ColumnName, SQLSMALLINT NameLength4) +RETCODE SQL_API +SQLColumnsW(HSTMT StatementHandle, + SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLWCHAR *ColumnName, SQLSMALLINT NameLength4) { CSTR func = "SQLColumnsW"; RETCODE ret; @@ -77,10 +78,11 @@ RETCODE SQL_API SQLColumnsW(HSTMT StatementHandle, } -RETCODE SQL_API SQLConnectW(HDBC ConnectionHandle, - SQLWCHAR *ServerName, SQLSMALLINT NameLength1, - SQLWCHAR *UserName, SQLSMALLINT NameLength2, - SQLWCHAR *Authentication, SQLSMALLINT NameLength3) +RETCODE SQL_API +SQLConnectW(HDBC ConnectionHandle, + SQLWCHAR *ServerName, SQLSMALLINT NameLength1, + SQLWCHAR *UserName, SQLSMALLINT NameLength2, + SQLWCHAR *Authentication, SQLSMALLINT NameLength3) { CSTR func = "SQLConnectW"; char *svName, *usName, *auth; @@ -110,14 +112,15 @@ RETCODE SQL_API SQLConnectW(HDBC ConnectionHandle, return ret; } -RETCODE SQL_API SQLDriverConnectW(HDBC hdbc, - HWND hwnd, - SQLWCHAR *szConnStrIn, - SQLSMALLINT cbConnStrIn, - SQLWCHAR *szConnStrOut, - SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT FAR *pcbConnStrOut, - SQLUSMALLINT fDriverCompletion) +RETCODE SQL_API +SQLDriverConnectW(HDBC hdbc, + HWND hwnd, + SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT FAR *pcbConnStrOut, + SQLUSMALLINT fDriverCompletion) { CSTR func = "SQLDriverConnectW"; char *szIn, *szOut = NULL; @@ -175,13 +178,13 @@ inolog("cbConnstrOutMax=%d pcb=%p\n", cbConnStrOutMax, pcbConnStrOut); free(szIn); return ret; } -RETCODE SQL_API SQLBrowseConnectW( - HDBC hdbc, - SQLWCHAR *szConnStrIn, - SQLSMALLINT cbConnStrIn, - SQLWCHAR *szConnStrOut, - SQLSMALLINT cbConnStrOutMax, - SQLSMALLINT *pcbConnStrOut) +RETCODE SQL_API +SQLBrowseConnectW(HDBC hdbc, + SQLWCHAR *szConnStrIn, + SQLSMALLINT cbConnStrIn, + SQLWCHAR *szConnStrOut, + SQLSMALLINT cbConnStrOutMax, + SQLSMALLINT *pcbConnStrOut) { CSTR func = "SQLBrowseConnectW"; char *szIn, *szOut; @@ -214,11 +217,12 @@ RETCODE SQL_API SQLBrowseConnectW( return ret; } -RETCODE SQL_API SQLDataSourcesW(HENV EnvironmentHandle, - SQLUSMALLINT Direction, SQLWCHAR *ServerName, - SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, - SQLWCHAR *Description, SQLSMALLINT BufferLength2, - SQLSMALLINT *NameLength2) +RETCODE SQL_API +SQLDataSourcesW(HENV EnvironmentHandle, + SQLUSMALLINT Direction, SQLWCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLWCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) { CSTR func = "SQLDataSourcesW"; mylog("[%s]", func); @@ -230,11 +234,12 @@ RETCODE SQL_API SQLDataSourcesW(HENV EnvironmentHandle, return SQL_ERROR; } -RETCODE SQL_API SQLDescribeColW(HSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, - SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, - SQLSMALLINT *DataType, SQLULEN *ColumnSize, - SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) +RETCODE SQL_API +SQLDescribeColW(HSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable) { CSTR func = "SQLDescribeColW"; RETCODE ret; @@ -283,8 +288,9 @@ RETCODE SQL_API SQLDescribeColW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLExecDirectW(HSTMT StatementHandle, - SQLWCHAR *StatementText, SQLINTEGER TextLength) +RETCODE SQL_API +SQLExecDirectW(HSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength) { CSTR func = "SQLExecDirectW"; RETCODE ret; @@ -312,9 +318,10 @@ RETCODE SQL_API SQLExecDirectW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLGetCursorNameW(HSTMT StatementHandle, - SQLWCHAR *CursorName, SQLSMALLINT BufferLength, - SQLSMALLINT *NameLength) +RETCODE SQL_API +SQLGetCursorNameW(HSTMT StatementHandle, + SQLWCHAR *CursorName, SQLSMALLINT BufferLength, + SQLSMALLINT *NameLength) { CSTR func = "SQLGetCursorNameW"; RETCODE ret; @@ -357,9 +364,10 @@ RETCODE SQL_API SQLGetCursorNameW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLGetInfoW(HDBC ConnectionHandle, - SQLUSMALLINT InfoType, PTR InfoValue, - SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) +RETCODE SQL_API +SQLGetInfoW(HDBC ConnectionHandle, + SQLUSMALLINT InfoType, PTR InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength) { CSTR func = "SQLGetInfoW"; ConnectionClass *conn = (ConnectionClass *) ConnectionHandle; @@ -394,8 +402,9 @@ RETCODE SQL_API SQLGetInfoW(HDBC ConnectionHandle, return ret; } -RETCODE SQL_API SQLPrepareW(HSTMT StatementHandle, - SQLWCHAR *StatementText, SQLINTEGER TextLength) +RETCODE SQL_API +SQLPrepareW(HSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength) { CSTR func = "SQLPrepareW"; StatementClass *stmt = (StatementClass *) StatementHandle; @@ -419,8 +428,9 @@ RETCODE SQL_API SQLPrepareW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLSetCursorNameW(HSTMT StatementHandle, - SQLWCHAR *CursorName, SQLSMALLINT NameLength) +RETCODE SQL_API +SQLSetCursorNameW(HSTMT StatementHandle, + SQLWCHAR *CursorName, SQLSMALLINT NameLength) { CSTR func = "SQLSetCursorNameW"; RETCODE ret; @@ -441,12 +451,13 @@ RETCODE SQL_API SQLSetCursorNameW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLSpecialColumnsW(HSTMT StatementHandle, - SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName, - SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, - SQLSMALLINT NameLength2, SQLWCHAR *TableName, - SQLSMALLINT NameLength3, SQLUSMALLINT Scope, - SQLUSMALLINT Nullable) +RETCODE SQL_API +SQLSpecialColumnsW(HSTMT StatementHandle, + SQLUSMALLINT IdentifierType, SQLWCHAR *CatalogName, + SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, + SQLSMALLINT NameLength2, SQLWCHAR *TableName, + SQLSMALLINT NameLength3, SQLUSMALLINT Scope, + SQLUSMALLINT Nullable) { CSTR func = "SQLSpecialColumnsW"; RETCODE ret; @@ -484,11 +495,12 @@ RETCODE SQL_API SQLSpecialColumnsW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLStatisticsW(HSTMT StatementHandle, - SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, - SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, - SQLWCHAR *TableName, SQLSMALLINT NameLength3, - SQLUSMALLINT Unique, SQLUSMALLINT Reserved) +RETCODE SQL_API +SQLStatisticsW(HSTMT StatementHandle, + SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, + SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, + SQLWCHAR *TableName, SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, SQLUSMALLINT Reserved) { CSTR func = "SQLStatisticsW"; RETCODE ret; @@ -526,7 +538,8 @@ RETCODE SQL_API SQLStatisticsW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLTablesW(HSTMT StatementHandle, +RETCODE SQL_API +SQLTablesW(HSTMT StatementHandle, SQLWCHAR *CatalogName, SQLSMALLINT NameLength1, SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName, SQLSMALLINT NameLength3, @@ -576,16 +589,16 @@ RETCODE SQL_API SQLTablesW(HSTMT StatementHandle, return ret; } -RETCODE SQL_API SQLColumnPrivilegesW( - HSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName, - SQLWCHAR *szColumnName, - SQLSMALLINT cbColumnName) +RETCODE SQL_API +SQLColumnPrivilegesW(HSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) { CSTR func = "SQLColumnPrivilegesW"; RETCODE ret; @@ -632,20 +645,20 @@ RETCODE SQL_API SQLColumnPrivilegesW( return ret; } -RETCODE SQL_API SQLForeignKeysW( - HSTMT hstmt, - SQLWCHAR *szPkCatalogName, - SQLSMALLINT cbPkCatalogName, - SQLWCHAR *szPkSchemaName, - SQLSMALLINT cbPkSchemaName, - SQLWCHAR *szPkTableName, - SQLSMALLINT cbPkTableName, - SQLWCHAR *szFkCatalogName, - SQLSMALLINT cbFkCatalogName, - SQLWCHAR *szFkSchemaName, - SQLSMALLINT cbFkSchemaName, - SQLWCHAR *szFkTableName, - SQLSMALLINT cbFkTableName) +RETCODE SQL_API +SQLForeignKeysW(HSTMT hstmt, + SQLWCHAR *szPkCatalogName, + SQLSMALLINT cbPkCatalogName, + SQLWCHAR *szPkSchemaName, + SQLSMALLINT cbPkSchemaName, + SQLWCHAR *szPkTableName, + SQLSMALLINT cbPkTableName, + SQLWCHAR *szFkCatalogName, + SQLSMALLINT cbFkCatalogName, + SQLWCHAR *szFkSchemaName, + SQLSMALLINT cbFkSchemaName, + SQLWCHAR *szFkTableName, + SQLSMALLINT cbFkTableName) { CSTR func = "SQLForeignKeysW"; RETCODE ret; @@ -694,13 +707,13 @@ RETCODE SQL_API SQLForeignKeysW( return ret; } -RETCODE SQL_API SQLNativeSqlW( - HDBC hdbc, - SQLWCHAR *szSqlStrIn, - SQLINTEGER cbSqlStrIn, - SQLWCHAR *szSqlStr, - SQLINTEGER cbSqlStrMax, - SQLINTEGER *pcbSqlStr) +RETCODE SQL_API +SQLNativeSqlW(HDBC hdbc, + SQLWCHAR *szSqlStrIn, + SQLINTEGER cbSqlStrIn, + SQLWCHAR *szSqlStr, + SQLINTEGER cbSqlStrMax, + SQLINTEGER *pcbSqlStr) { CSTR func = "SQLNativeSqlW"; RETCODE ret; @@ -748,14 +761,14 @@ RETCODE SQL_API SQLNativeSqlW( return ret; } -RETCODE SQL_API SQLPrimaryKeysW( - HSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName) +RETCODE SQL_API +SQLPrimaryKeysW(HSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) { CSTR func = "SQLPrimaryKeysW"; RETCODE ret; @@ -792,16 +805,16 @@ RETCODE SQL_API SQLPrimaryKeysW( return ret; } -RETCODE SQL_API SQLProcedureColumnsW( - HSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szProcName, - SQLSMALLINT cbProcName, - SQLWCHAR *szColumnName, - SQLSMALLINT cbColumnName) +RETCODE SQL_API +SQLProcedureColumnsW(HSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName, + SQLWCHAR *szColumnName, + SQLSMALLINT cbColumnName) { CSTR func = "SQLProcedureColumnsW"; RETCODE ret; @@ -848,14 +861,14 @@ RETCODE SQL_API SQLProcedureColumnsW( return ret; } -RETCODE SQL_API SQLProceduresW( - HSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szProcName, - SQLSMALLINT cbProcName) +RETCODE SQL_API +SQLProceduresW(HSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szProcName, + SQLSMALLINT cbProcName) { CSTR func = "SQLProceduresW"; RETCODE ret; @@ -898,14 +911,14 @@ RETCODE SQL_API SQLProceduresW( return ret; } -RETCODE SQL_API SQLTablePrivilegesW( - HSTMT hstmt, - SQLWCHAR *szCatalogName, - SQLSMALLINT cbCatalogName, - SQLWCHAR *szSchemaName, - SQLSMALLINT cbSchemaName, - SQLWCHAR *szTableName, - SQLSMALLINT cbTableName) +RETCODE SQL_API +SQLTablePrivilegesW(HSTMT hstmt, + SQLWCHAR *szCatalogName, + SQLSMALLINT cbCatalogName, + SQLWCHAR *szSchemaName, + SQLSMALLINT cbSchemaName, + SQLWCHAR *szTableName, + SQLSMALLINT cbTableName) { CSTR func = "SQLTablePrivilegesW"; RETCODE ret; @@ -948,9 +961,9 @@ RETCODE SQL_API SQLTablePrivilegesW( return ret; } -RETCODE SQL_API SQLGetTypeInfoW( - SQLHSTMT StatementHandle, - SQLSMALLINT DataType) +RETCODE SQL_API +SQLGetTypeInfoW(SQLHSTMT StatementHandle, + SQLSMALLINT DataType) { CSTR func = "SQLGetTypeInfoW"; RETCODE ret; diff --git a/pgapi30.c b/pgapi30.c index 6a9bd02..a5bd4d2 100644 --- a/pgapi30.c +++ b/pgapi30.c @@ -33,9 +33,9 @@ /* SQLError -> SQLDiagRec */ RETCODE SQL_API PGAPI_GetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLCHAR *Sqlstate, - SQLINTEGER *NativeError, SQLCHAR *MessageText, - SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) + SQLSMALLINT RecNumber, SQLCHAR *Sqlstate, + SQLINTEGER *NativeError, SQLCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { RETCODE ret; CSTR func = "PGAPI_GetDiagRec"; @@ -77,9 +77,9 @@ PGAPI_GetDiagRec(SQLSMALLINT HandleType, SQLHANDLE Handle, */ RETCODE SQL_API PGAPI_GetDiagField(SQLSMALLINT HandleType, SQLHANDLE Handle, - SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, - PTR DiagInfoPtr, SQLSMALLINT BufferLength, - SQLSMALLINT *StringLengthPtr) + SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier, + PTR DiagInfoPtr, SQLSMALLINT BufferLength, + SQLSMALLINT *StringLengthPtr) { RETCODE ret = SQL_ERROR, rtn; ConnectionClass *conn; @@ -395,8 +395,8 @@ inolog("rc=%d\n", rc); /* SQLGetConnectOption -> SQLGetconnectAttr */ RETCODE SQL_API PGAPI_GetConnectAttr(HDBC ConnectionHandle, - SQLINTEGER Attribute, PTR Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) + SQLINTEGER Attribute, PTR Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { ConnectionClass *conn = (ConnectionClass *) ConnectionHandle; RETCODE ret = SQL_SUCCESS; @@ -472,7 +472,7 @@ static void column_bindings_set(ARDFields *opts, int cols, BOOL maxset) static RETCODE SQL_API ARDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) { RETCODE ret = SQL_SUCCESS; ARDFields *opts = (ARDFields *) (desc + 1); @@ -642,7 +642,7 @@ static void parameter_ibindings_set(IPDFields *opts, int params, BOOL maxset) static RETCODE SQL_API APDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) { CSTR func = "APDSetField"; RETCODE ret = SQL_SUCCESS; @@ -757,7 +757,7 @@ inolog("%s RecN=%d allocated=%d\n", func, RecNumber, opts->allocated); static RETCODE SQL_API IRDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) { RETCODE ret = SQL_SUCCESS; IRDFields *opts = (IRDFields *) (desc + 1); @@ -813,7 +813,7 @@ IRDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber, static RETCODE SQL_API IPDSetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength) { RETCODE ret = SQL_SUCCESS; IPDFields *ipdopts = (IPDFields *) (desc + 1); @@ -934,8 +934,8 @@ inolog("IPDSetField RecN=%d allocated=%d\n", RecNumber, ipdopts->allocated); static RETCODE SQL_API ARDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) { RETCODE ret = SQL_SUCCESS; SQLLEN ival = 0; @@ -1078,7 +1078,8 @@ ARDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, break; case SQL_DESC_DATETIME_INTERVAL_PRECISION: case SQL_DESC_LENGTH: - default:ret = SQL_ERROR; + default: + ret = SQL_ERROR; DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER, "invalid descriptor identifier"); } @@ -1106,8 +1107,8 @@ ARDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, static RETCODE SQL_API APDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) { RETCODE ret = SQL_SUCCESS; SQLLEN ival = 0; @@ -1258,8 +1259,8 @@ inolog("APDGetField RecN=%d allocated=%d\n", RecNumber, opts->allocated); static RETCODE SQL_API IRDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) { RETCODE ret = SQL_SUCCESS; SQLLEN ival = 0; @@ -1365,8 +1366,8 @@ IRDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, static RETCODE SQL_API IPDGetField(DescriptorClass *desc, SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) + SQLSMALLINT FieldIdentifier, PTR Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) { RETCODE ret = SQL_SUCCESS; SQLINTEGER ival = 0, len = 0, rettype = 0; @@ -1513,8 +1514,8 @@ inolog("IPDGetField RecN=%d allocated=%d\n", RecNumber, ipdopts->allocated); /* SQLGetStmtOption -> SQLGetStmtAttr */ RETCODE SQL_API PGAPI_GetStmtAttr(HSTMT StatementHandle, - SQLINTEGER Attribute, PTR Value, - SQLINTEGER BufferLength, SQLINTEGER *StringLength) + SQLINTEGER Attribute, PTR Value, + SQLINTEGER BufferLength, SQLINTEGER *StringLength) { CSTR func = "PGAPI_GetStmtAttr"; StatementClass *stmt = (StatementClass *) StatementHandle; @@ -1615,8 +1616,8 @@ PGAPI_GetStmtAttr(HSTMT StatementHandle, /* SQLSetConnectOption -> SQLSetConnectAttr */ RETCODE SQL_API PGAPI_SetConnectAttr(HDBC ConnectionHandle, - SQLINTEGER Attribute, PTR Value, - SQLINTEGER StringLength) + SQLINTEGER Attribute, PTR Value, + SQLINTEGER StringLength) { CSTR func = "PGAPI_SetConnectAttr"; ConnectionClass *conn = (ConnectionClass *) ConnectionHandle; @@ -1745,9 +1746,9 @@ PGAPI_SetConnectAttr(HDBC ConnectionHandle, /* new function */ RETCODE SQL_API PGAPI_GetDescField(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - PTR Value, SQLINTEGER BufferLength, - SQLINTEGER *StringLength) + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + PTR Value, SQLINTEGER BufferLength, + SQLINTEGER *StringLength) { CSTR func = "PGAPI_GetDescField"; RETCODE ret = SQL_SUCCESS; @@ -1796,8 +1797,8 @@ PGAPI_GetDescField(SQLHDESC DescriptorHandle, /* new function */ RETCODE SQL_API PGAPI_SetDescField(SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, - PTR Value, SQLINTEGER BufferLength) + SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier, + PTR Value, SQLINTEGER BufferLength) { CSTR func = "PGAPI_SetDescField"; RETCODE ret = SQL_SUCCESS; @@ -1846,8 +1847,8 @@ PGAPI_SetDescField(SQLHDESC DescriptorHandle, /* SQLSet(Param/Scroll/Stmt)Option -> SQLSetStmtAttr */ RETCODE SQL_API PGAPI_SetStmtAttr(HSTMT StatementHandle, - SQLINTEGER Attribute, PTR Value, - SQLINTEGER StringLength) + SQLINTEGER Attribute, PTR Value, + SQLINTEGER StringLength) { RETCODE ret = SQL_SUCCESS; CSTR func = "PGAPI_SetStmtAttr"; diff --git a/results.c b/results.c index 8b10d60..0864117 100644 --- a/results.c +++ b/results.c @@ -39,8 +39,7 @@ RETCODE SQL_API -PGAPI_RowCount( - HSTMT hstmt, +PGAPI_RowCount(HSTMT hstmt, SQLLEN FAR * pcrow) { CSTR func = "PGAPI_RowCount"; @@ -142,8 +141,7 @@ inolog("nfields=%d\n", irdflds->nfields); * attached to "hstmt". */ RETCODE SQL_API -PGAPI_NumResultCols( - HSTMT hstmt, +PGAPI_NumResultCols(HSTMT hstmt, SQLSMALLINT FAR * pccol) { CSTR func = "PGAPI_NumResultCols"; @@ -210,8 +208,7 @@ cleanup: * information about. */ RETCODE SQL_API -PGAPI_DescribeCol( - HSTMT hstmt, +PGAPI_DescribeCol(HSTMT hstmt, SQLUSMALLINT icol, SQLCHAR FAR * szColName, SQLSMALLINT cbColNameMax, @@ -444,8 +441,7 @@ cleanup: /* Returns result column descriptor information for a result set. */ RETCODE SQL_API -PGAPI_ColAttributes( - HSTMT hstmt, +PGAPI_ColAttributes(HSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, PTR rgbDesc, @@ -898,8 +894,7 @@ inolog("COLUMN_SCALE=%d\n", value); /* Returns result data for a single column in the current row. */ RETCODE SQL_API -PGAPI_GetData( - HSTMT hstmt, +PGAPI_GetData(HSTMT hstmt, SQLUSMALLINT icol, SQLSMALLINT fCType, PTR rgbValue, @@ -1131,8 +1126,7 @@ inolog("%s returning %d\n", __FUNCTION__, result); * advances the cursor. */ RETCODE SQL_API -PGAPI_Fetch( - HSTMT hstmt) +PGAPI_Fetch(HSTMT hstmt) { CSTR func = "PGAPI_Fetch"; StatementClass *stmt = (StatementClass *) hstmt; @@ -1204,8 +1198,10 @@ PGAPI_Fetch( static RETCODE SQL_API SC_pos_reload_needed(StatementClass *stmt, SQLULEN req_size, UDWORD flag); + SQLLEN -getNthValid(const QResultClass *res, SQLLEN sta, UWORD orientation, SQLULEN nth, SQLLEN *nearest) +getNthValid(const QResultClass *res, SQLLEN sta, UWORD orientation, + SQLULEN nth, SQLLEN *nearest) { SQLLEN i, num_tuples = QR_get_num_total_tuples(res), nearp; SQLULEN count; @@ -1391,8 +1387,7 @@ inolog("RETURN_EOF\n"); \ /* This fetchs a block of data (rowset). */ RETCODE SQL_API -PGAPI_ExtendedFetch( - HSTMT hstmt, +PGAPI_ExtendedFetch(HSTMT hstmt, SQLUSMALLINT fFetchType, SQLLEN irow, SQLULEN FAR * pcrow, @@ -1915,8 +1910,7 @@ cleanup: */ /* CC: return SQL_NO_DATA_FOUND since we do not support multiple result sets */ RETCODE SQL_API -PGAPI_MoreResults( - HSTMT hstmt) +PGAPI_MoreResults(HSTMT hstmt) { CSTR func = "PGAPI_MoreResults"; StatementClass *stmt = (StatementClass *) hstmt; @@ -3349,7 +3343,8 @@ SC_pos_reload_needed(StatementClass *stmt, SQLULEN req_size, UDWORD flag) } static RETCODE SQL_API -SC_pos_newload(StatementClass *stmt, const UInt4 *oidint, BOOL tidRef, const char *tidval) +SC_pos_newload(StatementClass *stmt, const UInt4 *oidint, BOOL tidRef, + const char *tidval) { CSTR func = "SC_pos_newload"; int i; @@ -3478,7 +3473,8 @@ QR_get_rowstart_in_cache(res), SC_get_rowset_start(stmt), stmt->options.cursor_t } static RETCODE SQL_API -irow_update(RETCODE ret, StatementClass *stmt, StatementClass *ustmt, SQLSETPOSIROW irow, SQLULEN global_ridx) +irow_update(RETCODE ret, StatementClass *stmt, StatementClass *ustmt, + SQLSETPOSIROW irow, SQLULEN global_ridx) { CSTR func = "irow_update"; @@ -3899,7 +3895,8 @@ inolog(".status[%d]=%x\n", global_ridx, res->keyset[kres_ridx].status); } static RETCODE SQL_API -irow_insert(RETCODE ret, StatementClass *stmt, StatementClass *istmt, SQLLEN addpos) +irow_insert(RETCODE ret, StatementClass *stmt, StatementClass *istmt, + SQLLEN addpos) { CSTR func = "irow_insert"; @@ -4391,8 +4388,7 @@ inolog("\n"); * This will be useful (so far) only when using SQLGetData after SQLExtendedFetch. */ RETCODE SQL_API -PGAPI_SetPos( - HSTMT hstmt, +PGAPI_SetPos(HSTMT hstmt, SQLSETPOSIROW irow, SQLUSMALLINT fOption, SQLUSMALLINT fLock) @@ -4496,10 +4492,10 @@ mylog("num_cols=%d gdatainfo=%d\n", QR_NumPublicResultCols(s.res), gdata_allocat /* Sets options that control the behavior of cursors. */ RETCODE SQL_API -PGAPI_SetScrollOptions( HSTMT hstmt, - SQLUSMALLINT fConcurrency, - SQLLEN crowKeyset, - SQLUSMALLINT crowRowset) +PGAPI_SetScrollOptions(HSTMT hstmt, + SQLUSMALLINT fConcurrency, + SQLLEN crowKeyset, + SQLUSMALLINT crowRowset) { CSTR func = "PGAPI_SetScrollOptions"; StatementClass *stmt = (StatementClass *) hstmt; @@ -4514,10 +4510,9 @@ PGAPI_SetScrollOptions( HSTMT hstmt, /* Set the cursor name on a statement handle */ RETCODE SQL_API -PGAPI_SetCursorName( - HSTMT hstmt, - const SQLCHAR FAR * szCursor, - SQLSMALLINT cbCursor) +PGAPI_SetCursorName(HSTMT hstmt, + const SQLCHAR FAR * szCursor, + SQLSMALLINT cbCursor) { CSTR func = "PGAPI_SetCursorName"; StatementClass *stmt = (StatementClass *) hstmt; @@ -4537,8 +4532,7 @@ PGAPI_SetCursorName( /* Return the cursor name for a statement handle */ RETCODE SQL_API -PGAPI_GetCursorName( - HSTMT hstmt, +PGAPI_GetCursorName(HSTMT hstmt, SQLCHAR FAR * szCursor, SQLSMALLINT cbCursorMax, SQLSMALLINT FAR * pcbCursor) diff --git a/statement.c b/statement.c index eced353..19510bf 100644 --- a/statement.c +++ b/statement.c @@ -1571,24 +1571,24 @@ inolog("SC_full_error_copy %p->%p\n", from ,self); self->pgerror = pgerror; } -/* Returns the next SQL error information. */ -RETCODE SQL_API -PGAPI_StmtError( SQLHSTMT hstmt, - SQLSMALLINT RecNumber, - SQLCHAR FAR * szSqlState, - SQLINTEGER FAR * pfNativeError, - SQLCHAR FAR * szErrorMsg, - SQLSMALLINT cbErrorMsgMax, - SQLSMALLINT FAR * pcbErrorMsg, - UWORD flag) +/* Returns the next SQL error information. */ +RETCODE SQL_API +PGAPI_StmtError(SQLHSTMT hstmt, + SQLSMALLINT RecNumber, + SQLCHAR FAR * szSqlState, + SQLINTEGER FAR * pfNativeError, + SQLCHAR FAR * szErrorMsg, + SQLSMALLINT cbErrorMsgMax, + SQLSMALLINT FAR * pcbErrorMsg, + UWORD flag) { /* CC: return an error of a hdesc */ StatementClass *stmt = (StatementClass *) hstmt; stmt->pgerror = SC_create_errorinfo(stmt); return ER_ReturnError(&(stmt->pgerror), RecNumber, szSqlState, - pfNativeError, szErrorMsg, cbErrorMsgMax, - pcbErrorMsg, flag); + pfNativeError, szErrorMsg, cbErrorMsgMax, + pcbErrorMsg, flag); } time_t -- 2.39.5