From 7ec2337580447068b20dd3230c50229eae85dc08 Mon Sep 17 00:00:00 2001
From: Hunaid Sohail <76044242+Hunaid2000@users.noreply.github.com>
Date: Mon, 20 May 2024 01:22:18 +0500
Subject: [PATCH] Fixed typos in all source code and documentations (#11)
---
bind.c | 2 +-
configure.ac | 2 +-
connection.c | 6 ++--
connection.h | 2 +-
convert.c | 8 ++---
dlg_specific.c | 2 +-
dlg_wingui.c | 2 +-
docs/config.html | 2 +-
docs/release-7.3.html | 20 +++++------
docs/release.html | 67 ++++++++++++++++++-------------------
docs/win32-compilation.html | 4 +--
drvconn.c | 4 +--
execute.c | 4 +--
info.c | 12 +++----
msdtc_enlist.cpp | 8 ++---
odbc.sql | 2 +-
odbcapi30.c | 4 +--
odbcapi30w.c | 2 +-
pgapi30.c | 4 +--
pgtypes.c | 6 ++--
pgtypes.h | 2 +-
psqlodbc.h | 2 +-
psqlodbc.rc | 2 +-
qresult.c | 6 ++--
qresult.h | 4 +--
readme.txt | 2 +-
results.c | 14 ++++----
statement.c | 10 +++---
28 files changed, 102 insertions(+), 103 deletions(-)
diff --git a/bind.c b/bind.c
index ecddea8f..59ddea11 100644
--- a/bind.c
+++ b/bind.c
@@ -375,7 +375,7 @@ MYLOG(DETAIL_LOG_LEVEL, "[%d].SQLType=%d .PGType=%d\n", ipar, ipdopts->parameter
else
{
ret = SQL_ERROR;
- SC_set_error(stmt, STMT_EXEC_ERROR, "Unfortunatley couldn't get this paramater's info", func);
+ SC_set_error(stmt, STMT_EXEC_ERROR, "Unfortunately couldn't get this paramater's info", func);
goto cleanup;
}
}
diff --git a/configure.ac b/configure.ac
index eae07b20..16cc90b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ PGAC_ARG_BOOL(enable, pthreads, yes,
[ --disable-pthreads do not build with POSIX threads],
[AC_DEFINE(POSIX_MULTITHREAD_SUPPORT, 1,
[Define to 1 to build with pthreads support (--enable-pthreads)])
- AC_DEFINE(_REENTRANT, 1, [Define _REENTRANT for several plaforms])])
+ AC_DEFINE(_REENTRANT, 1, [Define _REENTRANT for several platforms])])
#
diff --git a/connection.c b/connection.c
index 3e6d246a..1c55af84 100644
--- a/connection.c
+++ b/connection.c
@@ -1674,7 +1674,7 @@ CC_from_PGresult(QResultClass *res, StatementClass *stmt,
CC_set_error(conn, CONN_NO_MEMORY_ERROR, NULL, __FUNCTION__);
break;
case PORES_BAD_RESPONSE:
- CC_set_error(conn, CONNECTION_COMMUNICATION_ERROR, "communication error occured", __FUNCTION__);
+ CC_set_error(conn, CONNECTION_COMMUNICATION_ERROR, "communication error occurred", __FUNCTION__);
break;
default:
CC_set_error(conn, CONN_EXEC_ERROR, QR_get_message(res), __FUNCTION__);
@@ -1829,7 +1829,7 @@ CC_send_query_append(ConnectionClass *self, const char *query, QueryInfo *qi, UD
/*
* In case the round trip time can be ignored, the query
- * and the appeneded query would be issued separately.
+ * and the appended query would be issued separately.
* Otherwise a multiple command query would be issued.
*/
if (appendq && ignore_roundtrip_time)
@@ -2091,7 +2091,7 @@ MYLOG(DETAIL_LOG_LEVEL, "Discarded a RELEASE result\n");
case PGRES_FATAL_ERROR:
handle_pgres_error(self, pgres, "send_query", res, TRUE);
- /* We should report that an error occured. Zoltan */
+ /* We should report that an error occurred. Zoltan */
aborted = TRUE;
query_completed = TRUE;
diff --git a/connection.h b/connection.h
index 73e8367d..f4299769 100644
--- a/connection.h
+++ b/connection.h
@@ -337,7 +337,7 @@ struct ConnectionClass_
Int2 num_discardp;
char **discardp;
int num_descs;
- SQLUINTEGER default_isolation; /* server's default isolation initially unkown */
+ SQLUINTEGER default_isolation; /* server's default isolation initially unknown */
DescriptorClass **descs;
pgNAME schemaIns;
pgNAME tableIns;
diff --git a/convert.c b/convert.c
index d94fdb68..c831991e 100644
--- a/convert.c
+++ b/convert.c
@@ -950,7 +950,7 @@ setup_getdataclass(SQLLEN * const length_return, const char ** const ptr_return,
#ifdef UNICODE_SUPPORT
if (0 == bytea_process_kind)
{
- if (get_convtype() > 0) /* coversion between the current locale is available */
+ if (get_convtype() > 0) /* conversion between the current locale is available */
{
BOOL wcs_debug = conn->connInfo.wcs_debug;
BOOL same_encoding = (conn->ccsc == pg_CS_code(conn->locale_encoding));
@@ -2001,7 +2001,7 @@ MYLOG(DETAIL_LOG_LEVEL, "SQL_C_VARBOOKMARK value=%d\n", ival);
/*--------------------------------------------------------------------
* Functions/Macros to get rid of query size limit.
*
- * I always used the follwoing macros to convert from
+ * I always used the following macros to convert from
* old_statement to new_statement. Please improve it
* if you have a better way. Hiroshi 2001/05/22
*--------------------------------------------------------------------
@@ -4422,7 +4422,7 @@ handle_lu_onvert_error(QueryBuild *qb, int flag, char *buffer, SQLLEN paralen)
{
case ReturnZeroLengthString:
if (qb->stmt)
- SC_set_error(qb->stmt, STMT_ERROR_IN_ROW, "conversion error to wide chars occured", __FUNCTION__);
+ SC_set_error(qb->stmt, STMT_ERROR_IN_ROW, "conversion error to wide chars occurred", __FUNCTION__);
return TRUE;
default:
qb->errornumber = STMT_EXEC_ERROR;
@@ -4725,7 +4725,7 @@ MYLOG(DETAIL_LOG_LEVEL, "ipara=%p paramName=%s paramType=%d %d proc_return=%d\n"
ivstruct = (SQL_INTERVAL_STRUCT *) buffer;
/* Convert input C type to a neutral format */
#ifdef UNICODE_SUPPORT
- if (get_convtype() > 0) /* coversion between the current locale is available */
+ if (get_convtype() > 0) /* conversion between the current locale is available */
{
BOOL wcs_debug = conn->connInfo.wcs_debug;
BOOL is_utf8 = (UTF8 == conn->ccsc);
diff --git a/dlg_specific.c b/dlg_specific.c
index 45662a67..b15f7a49 100644
--- a/dlg_specific.c
+++ b/dlg_specific.c
@@ -1607,7 +1607,7 @@ decode(const char *in)
/*
* Remove braces if the input value is enclosed by braces({}).
- * Othewise decode the input value.
+ * Otherwise decode the input value.
*/
static pgNAME
decode_or_remove_braces(const char *in)
diff --git a/dlg_wingui.c b/dlg_wingui.c
index c348ccc2..7801cad1 100644
--- a/dlg_wingui.c
+++ b/dlg_wingui.c
@@ -287,7 +287,7 @@ HMODULE DtcProc(const char *procname, FARPROC *proc)
*proc = NULL;
if (hmodule = LoadLibraryEx(GetXaLibPath(), NULL, LOAD_WITH_ALTERED_SEARCH_PATH), NULL != hmodule)
{
-MYLOG(0, "GetProcAddres for %s\n", procname);
+MYLOG(0, "GetProcAddress for %s\n", procname);
*proc = GetProcAddress(hmodule, procname);
}
diff --git a/docs/config.html b/docs/config.html
index 18f48c19..382b1ec2 100644
--- a/docs/config.html
+++ b/docs/config.html
@@ -116,7 +116,7 @@ Advanced Options 1/3 Dialog Box
columns!
Cache Size:When using
-cursors, this is the row size of the tuple cache and the defualt is 100 rows.
+cursors, this is the row size of the tuple cache and the default is 100 rows.
If not using cursors, this has no meaning.
Max LongVarChar: The maximum
diff --git a/docs/release-7.3.html b/docs/release-7.3.html
index ec63c0b3..1fa5e8b8 100644
--- a/docs/release-7.3.html
+++ b/docs/release-7.3.html
@@ -19,7 +19,7 @@ Note
[7.3.0261]
-1.Handle the converion from text-like field to SQL_C_BINARY more properly.
+1.Handle the conversion from text-like field to SQL_C_BINARY more properly.
2.Make buffer extension in SQLPutData more effective.
3.Reply SQL_CONVERT_xxxx correctly for SQLGetInfo request.
4.Reply DBMS_NAME, DBMS_VERSION correctly for SQLGetInfo request.
@@ -27,7 +27,7 @@ Note
6.Change adjustLikePattern() to take literal quote(') into account.
7.Fix a bug in memory debug routine.
8.Change the multibyte encoding list to match that of the current
- offical driver.
+ official driver.
9.Change SC_clear_error() to call CC_clear_error() also.
10.Change the length values returned when they are unknown for
SQLDescribeCol or SQLColAttribute requests.
@@ -40,7 +40,7 @@ Note
of parameters.
4.Allow blanks in password.
5.Add an option to force abbreviation of connection string.
-6.Fix the handling of "PROTOCOL=x.x-x" in the connction string.
+6.Fix the handling of "PROTOCOL=x.x-x" in the connection string.
7.Fix the loadlib module of *nix.
[7.3.0260]
@@ -147,7 +147,7 @@ psqlODBC 08.01.0200 Release
Notes: psqlODBC 08.01.0107
1) fix next problem with calling implicit rollback in bad time
2) detecting transaction commands into if branch which mean backend
- successfuly done the command. add support for "start transaction"
+ successfully done the command. add support for "start transaction"
3) fix bug when mylog output can't be created
4) fix problem with SQLSetPos
5) fix problem with column length in CC_mapping
@@ -155,7 +155,7 @@ psqlODBC 08.01.0200 Release
Notes: psqlODBC 08.01.0106
1) fix problem with getting long text in unicode driver
-2) fix sqlstate iin case of error in statement
+2) fix sqlstate in case of error in statement
3) doesn't call rollback in autocommit off or in manual transaction
4) remove obsolete parameter protocol
@@ -382,10 +382,10 @@ === gborg.postgresql.org(This is the past history.) ===
8. Avoid those notorious core dumps when logging on hitting
"null" data...
<8: thanls to Hartmut Raschick>
-9. Removed a static varible for thread-safety.
+9. Removed a static variable for thread-safety.
10. Improve the performance of keyset-driven fetch operation.
11. Map (var)char type to SQL type more properly.
-12. Change create_params for NUMERIC type to (precison, scale).
+12. Change create_params for NUMERIC type to (precision, scale).
13. Add type cast to remove some compiler warnings.
1.30 by hinoue
@@ -460,7 +460,7 @@ === gborg.postgresql.org(This is the past history.) ===
Diffs ignoring whitespace to version 1.23 (long / unified)
1) Correct the return info for SQLGetInfo(.., SQL_CURSOR_COMMIT
(ROLLBACK)_BEHAVIOR) call.
-2) Explictly reject the SQLBrowseConnect call.
+2) Explicitly reject the SQLBrowseConnect call.
1.23 by hinoue
Mon Sep 15 04:25:03 2003 (8 weeks ago)
@@ -502,7 +502,7 @@ === gborg.postgresql.org(This is the past history.) ===
Changed since 1.18: +3 -3 [Select for Diff]
Diffs to version 1.18 (long / unified)
Diffs ignoring whitespace to version 1.18 (long / unified)
- Improve SQLGetDiagField so that an MFC appliaction reports
+ Improve SQLGetDiagField so that an MFC application reports
error messages properly(bug report from Silvio Scarpati).
1.18 by hinoue
@@ -550,7 +550,7 @@ === gborg.postgresql.org(This is the past history.) ===
Changed since 1.12: +3 -3 [Select for Diff]
Diffs to version 1.12 (long / unified)
Diffs ignoring whitespace to version 1.12 (long / unified)
- 1) Corrent the handling of bookmark in SQLBulkOperations.
+ 1) Correct the handling of bookmark in SQLBulkOperations.
2) Correct the calculation of a global index in SC_pos_add.
3) Cleanup global/rowset/resultset index handling a little.
diff --git a/docs/release.html b/docs/release.html
index 2e529f36..0b2c5331 100644
--- a/docs/release.html
+++ b/docs/release.html
@@ -21,7 +21,7 @@
Fix a bug that SQLGetDiagField(SQL_DIAG_NUMBER) with SQL_HANDLE_DBC returns SQL_NO_DATA even if an error record exists.
Fix a typo "RECISION" which should be "PRECISION".
Enable SQLColumnPrivileges functionality.
-Currenly SQLColumnPrivileges() call fails. Fix a typo which is the cause.
+Currently SQLColumnPrivileges() call fails. Fix a typo which is the cause.
Fix a bug that SQLColAttribute returns wrong column name.
@@ -99,13 +99,13 @@
If SQL_ATTR_CURSOR_TYPE of an statement is SQL_CURSOR_FORWARD_ONLY, SQL_ATTR_CONCURRENCY is SQL_CONCUR_READ_ONLY and extended protocol isn't used, the batch execution of the statement is possible.
A new option Batch Size was introduced for such cases.
Batch Size: Split an array (of parameters) into chunks of Batch Size to execute statements. The last chunk may contain less than Batch Size elements. Setting 1 to this option forces the current one by one execution.
-Also turn off use_server_side_prepare option temporarily when batch executuion is possible.
+Also turn off use_server_side_prepare option temporarily when batch execution is possible.
Change SC_execute() so that it returns a return code which is not
affetced by the preceding results. It's necessary for batch execution
with arrays of parameters.
Add a new option IgnoreTimeout.
Some tools issue issue SQLSetStmtAttr(.., SQL_ATTR_QUERY_TIMEOUT,,) internally and sometimes it's difficult for users to change the timeout value. You can disable the timeout by turning on this option.
-An improvement for psqlodbc developpers.
+An improvement for psqlodbc developers.
Make it possible to call some shell scripts from other directories.
@@ -116,7 +116,7 @@
Remove tests for abstime type because the type was removed in PG12.
Update results for PG12's new floating point output format.
-Fix the bug that causes Error : A parameter cannot be found that matches parameter nameene'.
+Fix the bug that causes Error : A parameter cannot be found that matches parameter name�ene'.
- Check BuildResult(the result of drivers build) before building installers.
- Enclose the command part * Find_VSDir $vc_ver * with parentheses so that
@@ -163,7 +163,7 @@
- Remove connSettings option and/or pqopt option from the OutConnectionString parameter of SQLDriverConnect() when each option doesn't exist in InConnectionString parameter.
- The parameters should be cast because parameters of concat() function are variadic "any".
- Unbuffered-IO in Windows is incredibly slow. Instead call fflush() after fprintf().
-- Add an alias DX of *Database* keyword for connection strings to aviod the use of "database" keyword which has a special meaning in some apps or middlewares.
+- Add an alias DX of *Database* keyword for connection strings to avoid the use of "database" keyword which has a special meaning in some apps or middlewares.
- numeric items without precision are unlimited and there's no natural map between SQL Data types.
Add an option *Numeric(without precision) as*.
- Fix a bug that SQLSpecialColumns() returns oid/xmin incorrectly when a table does not exist.
@@ -177,7 +177,7 @@
Per report from Ayman Samamry.
- Fix SQLGetTypeInfo() so that it filters SQL_TYPE_DATE, SQL_TYPE_TIME or SQL_TYPE_TIMESTAMP for ODBC 2.x applications.
Per report from Oleg Tonkikh.
-- Revise ConfigDSN() so that it handles the 4th parameter(lpszAttribues) correctly.
+- Revise ConfigDSN() so that it handles the 4th parameter(lpszAttributes) correctly.
Per report from Haribabu Kommi.
- Fix a crash bug when handling error messages.
Also modified some error messages.
@@ -227,7 +227,7 @@
- Fix multibyte handling of ansi driver.
- Handle PG 10 identity columns.
- For PG10 servers, we will never see "unknown" output columns.
-- Improve @@identty handling.
+- Improve @@identity handling.
Use multibyte-aware eatTableIdentifiers() instead of next_name_token().
Use identifierEscape() to escape single quotes or double quotes.
- PG_PRINTF_ATTRIBUTE instead of printf in __attribute__((format(printf, .., ..))) function attribute.
@@ -256,7 +256,7 @@
- Add __FILE__, __FUNCTION__, __LINE__ to MYLOG.
- Fix an parameter unmatch error which would cause a crash.
- Removed some qlogs, changed some qlogs to MYLOG and added some qlogs.
-- Move the implemetation of GetExeName() from psqlodbc.c(psqlsetup.c) to mylog.c.
+- Move the implementation of GetExeName() from psqlodbc.c(psqlsetup.c) to mylog.c.
- Remove the GssAuthUseGssapi option completely.
- Fix bug that calls strdup() for NULL pointers.
Per report from Ding, Haiqiang.
@@ -272,7 +272,7 @@
Changes:
-- Fix buffer truncations. The truncations occured when concatenating 'RELEASE xxxx...;' and 'SAVEPOINT xxxx....'.
+- Fix buffer truncations. The truncations occurred when concatenating 'RELEASE xxxx...;' and 'SAVEPOINT xxxx....'.
Per reported by Pavel Raiskup.
- Correct the behavior of snprintfcat() on Windows using posix_vsnprintf() instead of _vsnprintf().
- Handle StrLen_or_IndPtr argument of SQLBindParameter() properly when StrLen_or_IndPtr doesn't point to SQL_NTS and conversions between SQLWCHAR and SQLCHAR occur.
@@ -303,7 +303,7 @@
- Fix a crash bug when connecting from MSACCESS(Microsoft Jet)
Per reported by Robert Ball.
-This occurs when MSACCESS(Jet) calls SQLConnectAttr(.., 30002, ..) => ucs2_to_utf8() and about to call mylog() with a NULL derefernced pointer parameter.
+This occurs when MSACCESS(Jet) calls SQLConnectAttr(.., 30002, ..) => ucs2_to_utf8() and about to call mylog() with a NULL dereferenced pointer parameter.
Changes:
@@ -404,7 +404,7 @@
- Enable SQLBulkOperations in declare/fetch mode using long (>=12bytes) bookmarks.
Formerly the driver offered very simple bookmark support -- it is just
the current row number. Now the driver offers more verbose bookmarks which
-contain KeySet informations (CTID (+ OID)). Though they consume 12bytes
+contain KeySet information (CTID (+ OID)). Though they consume 12bytes
(row number + CTID) or 16bytes (row number + CTID + OID), they are useful
in declare/fetch mode.
- a hack to handle boolean items in VBA with MS Access.
@@ -437,7 +437,7 @@
- Ignore the difference between CR LF, LF and CR line break when comparing expected and result output.
- Prior to Visual Studio 2015 Update 3, the hook functions of type PfnDliHook __pfnDliNotifyHook2 and __pfnDliFailureHook2 were non-const.
They were made const to improve security (global, writable function pointers are bad). If for backwards compatibility you require the hooks to be writable, define the macro DELAYIMP_INSECURE_WRITABLE_HOOKS prior to including this header and provide your own non-const definition of the hooks.
-The following infomation is from Dave Cramer(davecramer@gmail.com).
+The following information is from Dave Cramer(davecramer@gmail.com).
- Fix a regression test some failures.
@@ -518,7 +518,7 @@
- Unify midtemp and moneytemp.
- Variable wconverted is no longer needed.
- Pre_convert for PG_TYPE_BOOL is not needed.
- - It's better to take the same road even in case of pre_convet.
+ - It's better to take the same road even in case of pre_convert.
Fixed possible once to build test suite in a different place other than the source code is, it's not now.
@@ -774,7 +774,7 @@
Also add a prototype for ResolveNumericParam for readability.
Increase digits used to convert from REAL/DOUBLEs to strings so that the reverse conversions can recover original values.
Patch originally by John Smith.
-Clear errors for prepared statement for subsequent exections.
+Clear errors for prepared statement for subsequent executions.
Fix the problems using SQLFetch on prepared INSERT with RETURNING clause.
reported by John Smith.
Fix use of server-queried version before connection.
@@ -853,7 +853,7 @@
Improve the logging.
Fix the regkey search bug when XARMcreate() causes an error at enlistmentvin DTC.
-Additonal improvement on MSDTC enlistment.
+Additional improvement on MSDTC enlistment.
Unfortunately the current pgxalib.dll can't recover transactions which use sslmode verify-[ca|full] or whose authentication is SSPI, certificate or ident.
When MSDTC.exe tries to connect to PostgreSQL it does so under Windows user NETWORKSERVICE, which won't match the username the original user connected
to PostgreSQL as. So PostgreSQL will reject the connection.
@@ -903,16 +903,15 @@
Changes:
-- SSL verify[-(ca|full)] is avaiable since 8.4.
-There seems no need to check it. Also there's no need to call lt_dlopen currentl
-y.
+- SSL verify[-(ca|full)] is available since 8.4.
+There seems no need to check it. Also there's no need to call lt_dlopen currently.
- Update EXTRA_DIST in Makefile.am
Files for the new lfconversion test case were missing.
- Fix locking in SC_set_prepared
added ENTER/LEAVE_CRIT_CS calls in SC_set_prepared.
- Add test case for CTE queries (WITH ...)
None of the existing test cases covered that. This test case gives a different e
-rror message than the original one, but it'sthe same underlying issue.
+rror message than the original one, but it's the same underlying issue.
- Silence compiler warning.
SQLGUID format and conn_settings cannot be NULL.
This fixed by Michael Paquier.
@@ -936,7 +935,7 @@
- The driver takes SQL_C_LONG to mean SQLINTEGER rather than "long".
The regression test was failing on the s390x architecture because of that.
It's big-endian, with sizeof(long) == 8.
-- Revert "When LF->CR+LF conversion causes an buffer truncation, supress the conversion (in case of unicode)."
+- Revert "When LF->CR+LF conversion causes an buffer truncation, suppress the conversion (in case of unicode)."
- Refactor utf8_to_ucs_lf.
A macro is difficult to debug, so turn it into a regular function.
Also, add a new test case for LF->CR+LF conversion, to test the bug that Nils Go"sche reported (which was already fixed).
@@ -957,14 +956,14 @@
- Change SQL_ATTR_PARAMS_PROCESSED_PTR attribute which is set by SQLSetStmtAttr() from (SQLUINTEGER *) to (SQLULEN *).
This fixes the bug reported by Christopf Berg.
Also verify similar attributes which were changed from SQL(U)INTEGER (*) to SQL(U)LEN (*) when 64bit ODBC was introduced.
-- Reduce the memory usage of ConnectinClass objects by changing their large fixed length text fields to variable ones.
+- Reduce the memory usage of ConnectionClass objects by changing their large fixed length text fields to variable ones.
Because changes are applied to percent-encoded fields this time, password field is also a target of this.
- Revise MSDTC support.
Remove pointlessly complicated AsyncThreads stuff. Instead use _beginthread() to clean up threads.
Make pgenlist.dll from the structure change of ConnectionClass.
The driver dlls exports the functions described in connexp.h which are used by pgenlist.dll.
Isolate the current communication path if necessary.
- While an IAsyncPG object is alive, a ConnectionClass object (hereinafter refered to as conn-obj) is assigned to it.
+ While an IAsyncPG object is alive, a ConnectionClass object (hereinafter referred to as conn-obj) is assigned to it.
The assignment has to be changed in the following cases.
- SQLDisconnect() is called for the current connection handle which is assigned to an IAsyncPG object.
@@ -1017,7 +1016,7 @@
mode, the implicit BEGIN was ont sent. But without server-side prepares, it was. It seems best to send the implicit BEGIN in both cases, because then
you get a warning from the backend about the second BEGIN. That's a good thing, because a sane ODBC application should be using the ODBC function
SQLEndTran() for transaction control, not explicit BEGIN/COMMIT.
-- When LF->CR+LF conversion causes an buffer truncation, supress the conversion (in case of unicode).
+- When LF->CR+LF conversion causes an buffer truncation, suppress the conversion (in case of unicode).
- Handle SSL client certificate authentication in Windows Schannel security support provider.
You have to place the certificate file postgresql.pfx (PFX or PKCS12 format)
in %APPDATA%\postgresql folder instead of postgresql.crt and postgresql.key
@@ -1047,7 +1046,7 @@
They were broken, did not compile. This fixed by Michael Paquier.
- Add support for verify-ca/full sslmode using Windows Schannel Security Service Provider.
Root CAs must be installed into Windows Root certificate store beforehand.
-- VOID is not defined on all systems. Use void insted.
+- VOID is not defined on all systems. Use void instead.
This fixed by Christoph Berg.
- winres.h instead of afxres.h.
There are some cases (VS 2012 express etc) when afxres.h doesn't exist.
@@ -1072,7 +1071,7 @@
- Use snprintf() instead of sprintf() for safety.
I believe these instances were in fact safe, because a cursor name has a maximum length.
- bufferoverflowu.lib seems no longer needed in recent versions of VC environment.
-removed it from win64.mak. Speocify CUSTOMLINKLIBS=bufferoverflowu.lib from the command line when it is neccessary in old VC environment.
+removed it from win64.mak. Speocify CUSTOMLINKLIBS=bufferoverflowu.lib from the command line when it is necessary in old VC environment.
- Fix memset() call, meant to clear the whole struct.
Per compiler warning.(psqlodbc.c)
- socket: speedup also ipv6 connection
@@ -1139,7 +1138,7 @@
4.) Revise the handling of decimal point.
5.) Adjust the operations after closing eof-detected cursors.
6.) Before dropping the statement, sync and discard the response from the server for the pending extended query.
-7.) Clear col_info(columns info) cache ehen DROP/ALTER TABLE is called so that later SQLDescribeCol() etc work properly.
+7.) Clear col_info(columns info) cache when DROP/ALTER TABLE is called so that later SQLDescribeCol() etc work properly.
8.) Improve the handling of BYTEA type.
9.) Don't clear the columns cache info when they are referenced.
10.) Correct the column size of interval types.
@@ -1160,7 +1159,7 @@
Changes:
-1.) Don't propgate the connection level statment options to the internal statements. This fixes an infinite loop reported by Nelson Andre.
+1.) Don't propgate the connection level statement options to the internal statements. This fixes an infinite loop reported by Nelson Andre.
2.) Improved a mylog output.
3.) Fix the bug introduced by the previous change reprted by Adrien de Croy.
4.) Divide SC_returns_rows() macro into several categories and make SQLResultNumCols(), SQLDescribeCol() or SQLColAttribute() available
@@ -1243,14 +1242,14 @@
Changes:
1.) Avoid a crash on exit when using SSL connections by resetting CRTPTO_xx_callbacks before unloding libpq.
-2.) Correct the funtion name DiscardRollbackState pointed out by Zoltan Boszormenyi.
+2.) Correct the function name DiscardRollbackState pointed out by Zoltan Boszormenyi.
3.) Correct the value of INDEX_QUALIFIER column which returned by SLQSTATISTICS();
4.) Take domain types into account in SQLColumns() (Thanks to Luiz K. Matsumura).
5.) Take RESTRICT actions into account in SQLForeignKeys() (report from Farid Zidan).
6.) Fix a bug that small negative decimal values are mistaken for non-negative (bug report from Dominic Smith).
7.) Use MSG_NOSIGNAL/MSG_NOSIGPIPE option on send()/recv() to avoid crash on SIGPIPE (bug report from Brian Feldman).
8.) Remove a spurious "." with no trailing digits in timestamp representation (bug report from Brian Feldman).
-9.) Rename trim() funtion in order to avoid conflict of function name(report from Dominic Smith).
+9.) Rename trim() function in order to avoid conflict of function name(report from Dominic Smith).
10.) Put back the change to add *read only* clause for read only cursors.
11.) Improve pgtype_transfer_octet_length().
12.) Fix a bug reported by Milen Manev that SQLExec *select for a table* -> SQLDescribeCol() -> add a column to the table -> SQLExec *select for the table* -> SQLDescribeCol() for the added column causes a bad result.
@@ -1353,7 +1352,7 @@
Changes:
-1.) Allow non-admin or Vista users to create log fils in the home
+1.) Allow non-admin or Vista users to create log files in the home
directory.
2.) Fix an index over bug which causes a crash or an unexpected result.
@@ -1365,7 +1364,7 @@
4.) Remove WSAStartup() and WSACleanup() from DllMain.
5.) Load libpq from the driver's folder.
6.) Use QR_get_value_backend_int/_text() funcs instead of QR_get_value_backend_row().
-7.) Improve the implemetation of SQLSetPos(.., SQL_ADD/SQL_UPDATE) using the 8.2 new feature INSERT/UPDATE .. returning.
+7.) Improve the implementation of SQLSetPos(.., SQL_ADD/SQL_UPDATE) using the 8.2 new feature INSERT/UPDATE .. returning.
8.) Seaparate DTC code as a Delayload DLL.
@@ -1388,7 +1387,7 @@
Changes:
1) Fix a bug which forgets unnamed plans too early especially when handling large objects.
-2) Don't treat charcters whose value >= 128 as alphanumeric in case of conversion of binary data to bytea.
+2) Don't treat characters whose value >= 128 as alphanumeric in case of conversion of binary data to bytea.
3) Change ConfigDSN() so that it takes the options in Setup Dialog page 1 into account.
4) Simplify the memory management of statements'columns info so as to prevent memory leaks or a crash in parse_statement etc.
5) SQLTables("", SQL_ALL_SCHEMAS. "", ..) now returns a list of valid schemas.
@@ -1440,7 +1439,7 @@
Changes:
1) Compensate a loss of report of being Jet when using MS Access.
-2) Add NULL <-> "" date converion function for FOXPRO and
+2) Add NULL <-> "" date conversion function for FOXPRO and
revise parse/describe/execute mechanism.
3) Miscellaneous type changes for 64 bit drivers.
@@ -1484,7 +1483,7 @@
4) Improve the handling BIGINT type in the OSs without having strtoll().
5) Support ODBC CONVERT scalar functions in some cases.
6) Close qlog, mylog files on detach dll.
-7) Improve comunication performance in case of the driver's original socket.
+7) Improve communication performance in case of the driver's original socket.
8) Fix send a close
9) Support of IPV6.
diff --git a/docs/win32-compilation.html b/docs/win32-compilation.html
index 86d22f01..036a9fb8 100644
--- a/docs/win32-compilation.html
+++ b/docs/win32-compilation.html
@@ -55,7 +55,7 @@ Building with Powershell and MSBuild
or you can use the same functionality from Command Prompt using Windows
helper batch at the parent folder (..\). See ..\readme_winbuild.txt.
- C:\psqlodbc\> (Commnd Prompt) .\BuildAll.bat <options>
+ C:\psqlodbc\> (Command Prompt) .\BuildAll.bat <options>
1. Please start a powershell console and set the ExecutionPolicy of
Powershell to RemoteSigned or Unrestricted.
@@ -64,7 +64,7 @@ Building with Powershell and MSBuild
Get-ExecutionPolicy
- When the ExectionPolicy is "Restricted" or "AllSigned" then type e.g.
+ When the ExecutionPolicy is "Restricted" or "AllSigned" then type e.g.
Set-ExecutionPolicy RemoteSigned
diff --git a/drvconn.c b/drvconn.c
index 2e911699..61f709f5 100644
--- a/drvconn.c
+++ b/drvconn.c
@@ -503,9 +503,9 @@ dconn_get_attributes(copyfunc func, const char *connect_string, ConnInfo *ci)
/*
* Values enclosed with braces({}) can contain ; etc
* We don't remove the braces here because
- * decode_or_remove_braces() in dlg_specifi.c
+ * decode_or_remove_braces() in dlg_specific.c
* would remove them later.
- * Just correct the misdetected delimter(;).
+ * Just correct the misdetected delimiter(;).
*/
switch (*value)
{
diff --git a/execute.c b/execute.c
index 6696ce62..339e0c93 100644
--- a/execute.c
+++ b/execute.c
@@ -91,7 +91,7 @@ PGAPI_Prepare(HSTMT hstmt,
goto cleanup;
default:
- SC_set_error(self, STMT_INTERNAL_ERROR, "An Internal Error has occured -- Unknown statement status.", func);
+ SC_set_error(self, STMT_INTERNAL_ERROR, "An Internal Error has occurred -- Unknown statement status.", func);
retval = SQL_ERROR;
goto cleanup;
}
@@ -1398,7 +1398,7 @@ PGAPI_NativeSql(HDBC hdbc,
/*
* Supplies parameter data at execution time.
- * Used in conjuction with SQLPutData.
+ * Used in conjunction with SQLPutData.
*/
RETCODE SQL_API
PGAPI_ParamData(HSTMT hstmt,
diff --git a/info.c b/info.c
index bf9b08e3..fb17316a 100644
--- a/info.c
+++ b/info.c
@@ -3528,7 +3528,7 @@ PGAPI_Statistics(HSTMT hstmt,
while (SQL_SUCCEEDED(result))
{
- /* If only requesting unique indexs, then just return those. */
+ /* If only requesting unique indexes, then just return those. */
if (fUnique == SQL_INDEX_ALL ||
(fUnique == SQL_INDEX_UNIQUE && atoi(isunique)))
{
@@ -3972,7 +3972,7 @@ PGAPI_PrimaryKeys(HSTMT hstmt,
case 2:
/*
- * Simplified query to search old fashoned primary key
+ * Simplified query to search old fashioned primary key
*/
appendPQExpBuffer(&tables_query, "select ta.attname, ia.attnum, ic.relname, n.nspname, NULL"
" from pg_catalog.pg_attribute ta,"
@@ -4152,7 +4152,7 @@ getClientColumnName(ConnectionClass *conn, UInt4 relid, char *serverColumnName,
QR_Destructor(res);
}
continueExec = (continueExec && !bError);
- /* restore the cleint encoding */
+ /* restore the client encoding */
SPRINTF_FIXED(query, "SET CLIENT_ENCODING TO '%s'", conn->original_client_encoding);
bError = (!QR_command_maybe_successful((res = CC_send_query(conn, query, NULL, flag, NULL))));
QR_Destructor(res);
@@ -5534,7 +5534,7 @@ PGAPI_Procedures(HSTMT hstmt,
#define ACLMAX 8
-#define ALL_PRIVILIGES "arwdRxt"
+#define ALL_PRIVILEGES "arwdRxt"
static int
usracl_auth(char *usracl, const char *auth)
{
@@ -5806,7 +5806,7 @@ MYLOG(0, "guid=%s\n", uid);
owner = QR_get_value_backend_text(wres, i, 1);
schnm = QR_get_value_backend_text(wres, i, 3);
/* The owner has all privileges */
- useracl_upd(useracl, allures, owner, ALL_PRIVILIGES);
+ useracl_upd(useracl, allures, owner, ALL_PRIVILEGES);
for (j = 0; j < usercount; j++)
{
user = QR_get_value_backend_text(allures, j, 0);
@@ -5814,7 +5814,7 @@ MYLOG(0, "guid=%s\n", uid);
sys = (strcmp(user, owner) == 0);
/* Super user has all privileges */
if (su)
- useracl_upd(useracl, allures, user, ALL_PRIVILIGES);
+ useracl_upd(useracl, allures, user, ALL_PRIVILEGES);
for (k = 0; k < ACLMAX; k++)
{
if (!useracl[j][k])
diff --git a/msdtc_enlist.cpp b/msdtc_enlist.cpp
index 248ec624..41812b0a 100755
--- a/msdtc_enlist.cpp
+++ b/msdtc_enlist.cpp
@@ -82,7 +82,7 @@ DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
* 2:[CONN_CS] -- per psqlodbc connection lock
* This lock would be held for a pretty long time while accessing
* the psqlodbc connection assigned to an IAsyncPG object. You
- * can use the connecion safely by holding a ELOCK for the
+ * can use the connection safely by holding a ELOCK for the
* IAsyncPG object because the assignment is ensured to be
* fixed while the ELOCK is held.
*
@@ -1039,12 +1039,12 @@ static int regkeyCheck(const char *xalibname, const char *xalibpath)
else
{
retcode = -1;
- mylog("%s:SetValuEx ret=%d\n", __FUNCTION__, ret);
+ mylog("%s:SetValueEx ret=%d\n", __FUNCTION__, ret);
}
break;
default:
retcode = -1;
- mylog("%s:QueryValuEx ret=%d\n", __FUNCTION__, ret);
+ mylog("%s:QueryValueEx ret=%d\n", __FUNCTION__, ret);
break;
}
::RegCloseKey(sKey);
@@ -1073,7 +1073,7 @@ RETCODE static EnlistInDtc_1pipe(void *conn, ITransaction *pTra, ITransactionDis
res = pDtc->QueryInterface(IID_IDtcToXaHelperSinglePipe, (void **) &pHelper);
if (res != S_OK || !pHelper)
{
- mylog("DtcToXaHelperSingelPipe get error %d\n", res);
+ mylog("DtcToXaHelperSinglePipe get error %d\n", res);
pHelper = NULL;
return SQL_ERROR;
}
diff --git a/odbc.sql b/odbc.sql
index c470606e..6103221e 100644
--- a/odbc.sql
+++ b/odbc.sql
@@ -79,7 +79,7 @@ CREATE OR REPLACE FUNCTION ucase(text) RETURNS text AS '
-- Numeric Functions
-- +++++++++++++++++
--
--- Built-in: ABS, ACOS, ASIN, ATAN, ATAN2, COS, COT, DEGRESS, EXP,
+-- Built-in: ABS, ACOS, ASIN, ATAN, ATAN2, COS, COT, DEGREES, EXP,
-- FLOOR, MOD, PI, RADIANS, ROUND, SIGN, SIN, SQRT, TAN
-- Missing: LOG (ODBC sense)
diff --git a/odbcapi30.c b/odbcapi30.c
index 38f41dff..95e3a302 100644
--- a/odbcapi30.c
+++ b/odbcapi30.c
@@ -220,7 +220,7 @@ MYLOG(0, "bookmark=" FORMAT_LEN " FetchOffset = " FORMAT_LEN "\n", FetchOffset,
}
else
{
- SC_set_error(stmt, STMT_SEQUENCE_ERROR, "Bookmark isn't specifed yet", func);
+ SC_set_error(stmt, STMT_SEQUENCE_ERROR, "Bookmark isn't specified yet", func);
ret = SQL_ERROR;
}
}
@@ -450,7 +450,7 @@ SQLSetDescField(SQLHDESC DescriptorHandle,
return ret;
}
-/* new fucntion */
+/* new function */
RETCODE SQL_API
SQLSetDescRec(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT Type,
diff --git a/odbcapi30w.c b/odbcapi30w.c
index b1d93e8a..2c316f71 100644
--- a/odbcapi30w.c
+++ b/odbcapi30w.c
@@ -431,7 +431,7 @@ SQLGetDescRecW(SQLHDESC DescriptorHandle,
return SQL_ERROR;
}
-/* new fucntion */
+/* new function */
RETCODE SQL_API
SQLSetDescRecW(SQLHDESC DescriptorHandle,
SQLSMALLINT RecNumber, SQLSMALLINT Type,
diff --git a/pgapi30.c b/pgapi30.c
index 5efeb851..bee7e82c 100644
--- a/pgapi30.c
+++ b/pgapi30.c
@@ -797,7 +797,7 @@ MYLOG(DETAIL_LOG_LEVEL, "RecN=%d allocated=%d\n", RecNumber, opts->allocated);
case SQL_DESC_NUM_PREC_RADIX:
default:ret = SQL_ERROR;
DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
- "invaid descriptor identifier");
+ "invalid descriptor identifier");
}
if (unbind)
opts->parameters[para_idx].buffer = NULL;
@@ -1275,7 +1275,7 @@ MYLOG(DETAIL_LOG_LEVEL, "RecN=%d allocated=%d\n", RecNumber, opts->allocated);
case SQL_DESC_LENGTH:
default:ret = SQL_ERROR;
DC_set_error(desc, DESC_INVALID_DESCRIPTOR_IDENTIFIER,
- "invalid descriptor identifer");
+ "invalid descriptor identifier");
}
switch (rettype)
{
diff --git a/pgtypes.c b/pgtypes.c
index a8ded270..741ecf46 100644
--- a/pgtypes.c
+++ b/pgtypes.c
@@ -1683,7 +1683,7 @@ pgtype_transfer_octet_length(const StatementClass *stmt, OID type, int column_si
#endif /* NOT_USED */
/*
- * corrsponds to "min_scale" in ODBC 2.x.
+ * corresponds to "min_scale" in ODBC 2.x.
*/
Int2
pgtype_min_decimal_digits(const ConnectionClass *conn, OID type)
@@ -1711,7 +1711,7 @@ pgtype_min_decimal_digits(const ConnectionClass *conn, OID type)
}
/*
- * corrsponds to "max_scale" in ODBC 2.x.
+ * corresponds to "max_scale" in ODBC 2.x.
*/
Int2
pgtype_max_decimal_digits(const ConnectionClass *conn, OID type)
@@ -1741,7 +1741,7 @@ pgtype_max_decimal_digits(const ConnectionClass *conn, OID type)
}
/*
- * corrsponds to "scale" in ODBC 2.x.
+ * corresponds to "scale" in ODBC 2.x.
*/
Int2
pgtype_decimal_digits(const StatementClass *stmt, OID type, int col)
diff --git a/pgtypes.h b/pgtypes.h
index 894b6d67..7ad4cd11 100644
--- a/pgtypes.h
+++ b/pgtypes.h
@@ -109,7 +109,7 @@ Int2 pgtype_attr_scale(const ConnectionClass *conn, OID type, int atttypmod, in
/* These functions can use static numbers or result sets(col parameter) */
Int4 pgtype_column_size(const StatementClass *stmt, OID type, int col, int handle_unknown_size_as); /* corresponds to "precision" in ODBC 2.x */
-SQLSMALLINT pgtype_precision(const StatementClass *stmt, OID type, int col, int handle_unknown_size_as); /* "precsion in ODBC 3.x */
+SQLSMALLINT pgtype_precision(const StatementClass *stmt, OID type, int col, int handle_unknown_size_as); /* "precision in ODBC 3.x */
/* the following size/length are of Int4 due to PG restriction */
Int4 pgtype_display_size(const StatementClass *stmt, OID type, int col, int handle_unknown_size_as);
Int4 pgtype_buffer_length(const StatementClass *stmt, OID type, int col, int handle_unknown_size_as);
diff --git a/psqlodbc.h b/psqlodbc.h
index eb81c176..435ea7cf 100644
--- a/psqlodbc.h
+++ b/psqlodbc.h
@@ -720,7 +720,7 @@ typedef struct
int initialize_global_cs(void);
enum { /* CC_conninfo_init option */
CLEANUP_FOR_REUSE = 1L /* reuse the info */
- ,INIT_GLOBALS = (1L << 1) /* init globals memebers */
+ ,INIT_GLOBALS = (1L << 1) /* init globals members */
};
void CC_conninfo_init(ConnInfo *conninfo, UInt4 option);
void CC_conninfo_release(ConnInfo *conninfo);
diff --git a/psqlodbc.rc b/psqlodbc.rc
index 75269c9d..0ee62450 100644
--- a/psqlodbc.rc
+++ b/psqlodbc.rc
@@ -717,7 +717,7 @@ END
DLG_OPTIONS_DS3 DIALOG DISCARDABLE 0, 0, 306, 243
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Adavanced Options(Datasource 3)"
+CAPTION "Advanced Options(Datasource 3)"
FONT 8, "MS Sans Serif"
BEGIN
PUSHBUTTON "Page 2",ID2NDPAGE,49,5,40,15
diff --git a/qresult.c b/qresult.c
index f4e5fd49..2ec8187a 100644
--- a/qresult.c
+++ b/qresult.c
@@ -922,7 +922,7 @@ SQLLEN QR_move_cursor_to_last(QResultClass *self, StatementClass *stmt)
if (!QR_command_maybe_successful(res))
{
QR_Destructor(res);
- SC_set_error(stmt, STMT_EXEC_ERROR, "move error occured", __FUNCTION__);
+ SC_set_error(stmt, STMT_EXEC_ERROR, "move error occurred", __FUNCTION__);
return (-1);
}
moved = (-1);
@@ -1021,7 +1021,7 @@ MYLOG(DETAIL_LOG_LEVEL, "cache=" FORMAT_ULEN " rowset=%d movement=" FORMAT_ULEN
if (!QR_command_maybe_successful(mres))
{
QR_Destructor(mres);
- SC_set_error(stmt, STMT_EXEC_ERROR, "move error occured", func);
+ SC_set_error(stmt, STMT_EXEC_ERROR, "move error occurred", func);
RETURN(-1)
}
moved = movement;
@@ -1267,7 +1267,7 @@ MYLOG(DETAIL_LOG_LEVEL, "will add " FORMAT_LEN " added_tuples from " FORMAT_LEN
hidx = CacheIdx2GIdx(num_backend_rows, stmt, self);
lkidx = GIdx2KResIdx(lidx, stmt, self);
hkidx = GIdx2KResIdx(hidx, stmt, self);
- /* For simplicty, use CURS_NEEDS_REREAD bit to mark the row */
+ /* For simplicity, use CURS_NEEDS_REREAD bit to mark the row */
for (i = lkidx; i < hkidx; i++)
self->keyset[i].status |= CURS_NEEDS_REREAD;
/* deleted info */
diff --git a/qresult.h b/qresult.h
index a037291a..a06b5176 100644
--- a/qresult.h
+++ b/qresult.h
@@ -59,7 +59,7 @@ struct QResultClass_
/* Stuff for declare/fetch tuples */
SQLULEN num_total_read; /* the highest absolute position ever read in + 1 */
- SQLULEN count_backend_allocated;/* m(re)alloced count */
+ SQLULEN count_backend_allocated;/* m(re)allocated count */
SQLULEN num_cached_rows; /* count of tuples kept in backend_tuples member */
SQLLEN fetch_number; /* 0-based index to the tuple to read next */
SQLLEN cursTuple; /* absolute current position in the servr's cursor used to retrieve tuples from the DB */
@@ -90,7 +90,7 @@ struct QResultClass_
char flags; /* this result contains keyset etc ? */
po_ind_t move_direction; /* must move before fetching this
result set */
- SQLULEN count_keyset_allocated; /* m(re)alloced count */
+ SQLULEN count_keyset_allocated; /* m(re)allocated count */
SQLULEN num_cached_keys; /* count of keys kept in backend_keys member */
KeySet *keyset;
SQLLEN key_base; /* relative position of rowset start in the current keyset cache */
diff --git a/readme.txt b/readme.txt
index 8e5afb85..cfdc154b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -20,7 +20,7 @@
This library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
diff --git a/results.c b/results.c
index 546edd22..37dd07ae 100644
--- a/results.c
+++ b/results.c
@@ -767,7 +767,7 @@ MYLOG(DETAIL_LOG_LEVEL, "COLUMN_SCALE=" FORMAT_LEN "\n", value);
p = pgtype_to_name(stmt, field_type, col_idx, fi && fi->auto_increment);
break;
- case SQL_COLUMN_UNSIGNED: /* == SQL_DESC_UNSINGED */
+ case SQL_COLUMN_UNSIGNED: /* == SQL_DESC_UNSIGNED */
value = pgtype_unsigned(conn, field_type);
if (value == -1) /* non-numeric becomes TRUE (ODBC Doc) */
value = SQL_TRUE;
@@ -1119,7 +1119,7 @@ MYLOG(DETAIL_LOG_LEVEL, "currT=" FORMAT_LEN " base=" FORMAT_LEN " rowset=" FORMA
break;
case COPY_INVALID_STRING_CONVERSION: /* invalid string */
- SC_set_error(stmt, STMT_STRING_CONVERSION_ERROR, "invalid string conversion occured.", func);
+ SC_set_error(stmt, STMT_STRING_CONVERSION_ERROR, "invalid string conversion occurred.", func);
result = SQL_ERROR;
break;
@@ -1407,7 +1407,7 @@ MYLOG(DETAIL_LOG_LEVEL, "RETURN_EOF\n"); \
return SQL_NO_DATA_FOUND; \
}
-/* This fetchs a block of data (rowset). */
+/* This fetches a block of data (rowset). */
RETCODE SQL_API
PGAPI_ExtendedFetch(HSTMT hstmt,
SQLUSMALLINT fFetchType,
@@ -3849,7 +3849,7 @@ QR_get_rowstart_in_cache(res), SC_get_rowset_start(stmt), stmt->options.cursor_t
ret = SQL_NO_DATA_FOUND;
else
{
- SC_set_error(stmt, STMT_ROW_VERSION_CHANGED, "the driver cound't identify inserted rows", func);
+ SC_set_error(stmt, STMT_ROW_VERSION_CHANGED, "the driver could't identify inserted rows", func);
ret = SQL_ERROR;
}
/* stmt->currTuple = SC_get_rowset_start(stmt) + ridx; */
@@ -4174,7 +4174,7 @@ SC_pos_update(StatementClass *stmt,
ret = SQL_ERROR;
goto cleanup;
}
- /* else if (ret != SQL_SUCCESS) this is unneccesary
+ /* else if (ret != SQL_SUCCESS) this is unnecessary
SC_error_copy(s.stmt, s.qstmt, TRUE); */
}
else
@@ -4653,7 +4653,7 @@ SC_pos_add(StatementClass *stmt,
ret = SQL_ERROR;
goto cleanup;
}
- /* else if (ret != SQL_SUCCESS) this is unneccesary
+ /* else if (ret != SQL_SUCCESS) this is unnecessary
SC_error_copy(s.stmt, s.qstmt, TRUE); */
}
else
@@ -4984,7 +4984,7 @@ PGAPI_SetScrollOptions(HSTMT hstmt,
MYLOG(0, "entering fConcurrency=%d crowKeyset=" FORMAT_LEN " crowRowset=%d\n",
fConcurrency, crowKeyset, crowRowset);
- SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR, "SetScroll option not implemeted", func);
+ SC_set_error(stmt, STMT_NOT_IMPLEMENTED_ERROR, "SetScroll option not implemented", func);
return SQL_ERROR;
}
diff --git a/statement.c b/statement.c
index f45cd798..0e04453e 100644
--- a/statement.c
+++ b/statement.c
@@ -883,7 +883,7 @@ SC_recycle_statement(StatementClass *self)
break;
default:
- SC_set_error(self, STMT_INTERNAL_ERROR, "An internal error occured while recycling statements", func);
+ SC_set_error(self, STMT_INTERNAL_ERROR, "An internal error occurred while recycling statements", func);
return FALSE;
}
@@ -1840,7 +1840,7 @@ MYLOG(DETAIL_LOG_LEVEL, "curt=" FORMAT_LEN "\n", curt);
break;
case COPY_INVALID_STRING_CONVERSION: /* invalid string */
- SC_set_error(self, STMT_STRING_CONVERSION_ERROR, "invalid string conversion occured.", func);
+ SC_set_error(self, STMT_STRING_CONVERSION_ERROR, "invalid string conversion occurred.", func);
result = SQL_ERROR;
break;
@@ -1986,7 +1986,7 @@ SC_execute(StatementClass *self)
if (!SC_SetExecuting(self, TRUE))
{
- SC_set_error(self, STMT_OPERATION_CANCELLED, "Cancel Reuest Accepted", func);
+ SC_set_error(self, STMT_OPERATION_CANCELLED, "Cancel Request Accepted", func);
goto cleanup;
}
conn->status = CONN_EXECUTING;
@@ -2106,7 +2106,7 @@ SC_execute(StatementClass *self)
{
/*
* We shouldn't send COMMIT. Postgres backend does the autocommit
- * if neccessary. (Zoltan, 04/26/2000)
+ * if necessary. (Zoltan, 04/26/2000)
*/
/*
@@ -3197,7 +3197,7 @@ SC_set_errorinfo(StatementClass *self, QResultClass *res, int errkind)
SC_set_error_if_not_set(self, STMT_NO_MEMORY_ERROR, "memory allocation error???", __FUNCTION__);
break;
case PORES_BAD_RESPONSE:
- SC_set_error_if_not_set(self, STMT_COMMUNICATION_ERROR, "communication error occured", __FUNCTION__);
+ SC_set_error_if_not_set(self, STMT_COMMUNICATION_ERROR, "communication error occurred", __FUNCTION__);
break;
case PORES_INTERNAL_ERROR:
SC_set_error_if_not_set(self, STMT_INTERNAL_ERROR, "Internal error fetching next row", __FUNCTION__);