Grab bag of typo fixes

--------------010501010808050405020909
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

Attached is a patch with miscellaneous typo fixes, mostly in comments.

- Heikki

--------------010501010808050405020909
Content-Type: text/x-diff; name="typo-fixes-1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="typo-fixes-1.patch"

Index: DRVConfig/sapdb/README
===================================================================
--- DRVConfig/sapdb/README	(revision 116)
+++ DRVConfig/sapdb/README	(working copy)
@@ -18,7 +18,7 @@
 
 Also note that currently (09-Mar-2001) unixODBC crashes when you
 use the libsqlod from the sapdb-srv or sapdb-if RPM packages. If you
-use the one from the the sapdb-web RPM, then it works.
+use the one from the sapdb-web RPM, then it works.
 
 +-------------------------------------------------------------+
 | Holger Schurig [email protected]                         |
Index: DriverManager/SQLConnect.c
===================================================================
--- DriverManager/SQLConnect.c	(revision 116)
+++ DriverManager/SQLConnect.c	(working copy)
@@ -971,7 +971,7 @@
 
     /*
      * if the driver comes from odbc.ini not via odbcinst.ini the driver name will be empty
-     * so only look for the entry if its set
+     * so only look for the entry if it's set
      */
 
     if ( driver_name[ 0 ] != '\0' ) 
@@ -1148,7 +1148,7 @@
     }
 
     /*
-     * try and extract the ini and fini functions, and call ini if its 
+     * try and extract the ini and fini functions, and call ini if it's 
      * found
      */
 
@@ -2573,7 +2573,7 @@
     }
 
     /*
-     * now disconnect the environment, if its the last usage on the connection
+     * now disconnect the environment, if it's the last usage on the connection
      */
 
     if ( connection -> driver_env )
@@ -2637,7 +2637,7 @@
 void __disconnect_part_four( DMHDBC connection )
 {
     /*
-     * now disconnect the environment, if its the last usage on the connection
+     * now disconnect the environment, if it's the last usage on the connection
      */
 
     release_env( connection );
@@ -2868,7 +2868,7 @@
         ptr -> connection.driver_dbc = (DRV_SQLHANDLE)NULL;
 
         /*
-         * Only call freeenv if its the last connection to the driver
+         * Only call freeenv if it's the last connection to the driver
          */
 
         release_env( &ptr -> connection );
@@ -3144,8 +3144,8 @@
                 0 );
 
             /*
-             * if it failed assume that its because it doesn't support
-             * it, but its ok
+             * if it failed assume that it's because it doesn't support
+             * it, but it's ok
              */
 
             if ( SQL_SUCCEEDED( ret ))
@@ -3185,8 +3185,8 @@
                         &dead );
             
             /*
-             * if it failed assume that its because it doesn't support
-             * it, but its ok
+             * if it failed assume that it's because it doesn't support
+             * it, but it's ok
              */
 
             if ( SQL_SUCCEEDED( ret ))
@@ -3585,7 +3585,7 @@
     }
 
     /*
-     * allow the driver to reset itself if its a 3.8 driver
+     * allow the driver to reset itself if it's a 3.8 driver
      */
 
     if ( connection -> driver_version == SQL_OV_ODBC3_80 ) 
Index: DriverManager/SQLDisconnect.c
===================================================================
--- DriverManager/SQLDisconnect.c	(revision 116)
+++ DriverManager/SQLDisconnect.c	(working copy)
@@ -247,7 +247,7 @@
     }
 
     /*
-     * any statemnts that are in in SQL_NEED_DATA
+     * any statements that are in SQL_NEED_DATA
      */
 
     if( __check_stmt_from_dbc( connection, STATE_S8 )) {
Index: DriverManager/SQLDriverConnect.c
===================================================================
--- DriverManager/SQLDriverConnect.c	(revision 116)
+++ DriverManager/SQLDriverConnect.c	(working copy)
@@ -985,7 +985,7 @@
     }
 
     /*
-     * open the file dsn, get each entry from it, if its not in the connection 
+     * open the file dsn, get each entry from it, if it's not in the connection 
      * struct, add it
      */
 
@@ -1195,7 +1195,7 @@
 #endif
 
         /*
-         * Assume if its not in a odbcinst,ini then its a direct reference
+         * Assume if it's not in a odbcinst.ini then it's a direct reference
          */
 
         if ( lib_name[ 0 ] == '\0' ) {
Index: DriverManager/SQLDriverConnectW.c
===================================================================
--- DriverManager/SQLDriverConnectW.c	(revision 116)
+++ DriverManager/SQLDriverConnectW.c	(working copy)
@@ -477,7 +477,7 @@
 #endif
 
         /*
-         * Assume if its not in a odbcinst,ini then its a direct reference
+         * Assume if it's not in a odbcinst.ini then it's a direct reference
          */
 
         if ( lib_name[ 0 ] == '\0' ) {
Index: DriverManager/SQLSetConnectAttr.c
===================================================================
--- DriverManager/SQLSetConnectAttr.c	(revision 116)
+++ DriverManager/SQLSetConnectAttr.c	(working copy)
@@ -566,7 +566,7 @@
     value = __attr_override( connection, SQL_HANDLE_DBC, attribute, value, &string_length );
 
     /*
-     * we need to save this even if connected so we can use it for the next connetc
+     * we need to save this even if connected so we can use it for the next connect
      */
     if ( attribute == SQL_ATTR_LOGIN_TIMEOUT )
     {
Index: DriverManager/SQLSetConnectAttrW.c
===================================================================
--- DriverManager/SQLSetConnectAttrW.c	(revision 116)
+++ DriverManager/SQLSetConnectAttrW.c	(working copy)
@@ -502,7 +502,7 @@
     value = __attr_override_wide( connection, SQL_HANDLE_DBC, attribute, value, &string_length, buffer );
 
     /*
-     * we need to save this even if connected so we can use it for the next connetc
+     * we need to save this even if connected so we can use it for the next connect
      */
     if ( attribute == SQL_ATTR_LOGIN_TIMEOUT )
     {
Index: DriverManager/SQLSetEnvAttr.c
===================================================================
--- DriverManager/SQLSetEnvAttr.c	(revision 116)
+++ DriverManager/SQLSetEnvAttr.c	(working copy)
@@ -294,7 +294,7 @@
             /*
              * this must be one of the most brain dead atribute,
              * it can be set, but only to TRUE, any other value
-             * (ie FALSE) returns a error. Its almost as if its not
+             * (ie FALSE) returns a error. It's almost as if it's not
              * settable :-)
              */
 
Index: DriverManager/__handles.c
===================================================================
--- DriverManager/__handles.c	(revision 116)
+++ DriverManager/__handles.c	(working copy)
@@ -233,7 +233,7 @@
  * valid without the danger of a seg-vio.
  */
 
-static DMHENV enviroment_root;
+static DMHENV environment_root;
 static DMHDBC connection_root;
 static DMHSTMT statement_root;
 static DMHDESC descriptor_root;
@@ -247,25 +247,25 @@
  * We also have a mutex to protect the connection pooling code
  *
  * If compiled with thread support the DM allows four different
- * thread strategies
+ * thread strategies:
  *
- * Level 0 - Only the DM internal structures are protected
- * the driver is assumed to take care of it's self
+ * Level 0 - Only the DM internal structures are protected.
+ * The driver is assumed to take care of itself
  *
- * Level 1 - The driver is protected down to the statement level
- * each statement will be protected, and the same for the connect 
- * level for connect functions, note that descriptors are considered
+ * Level 1 - The driver is protected down to the statement level.
+ * Each statement will be protected, and the same for the connect 
+ * level for connect functions. Note that descriptors are considered
  * equal to statements when it comes to thread protection.
  *
- * Level 2 - The driver is protected at the connection level. only
- * one thread can be in a particular driver at one time
+ * Level 2 - The driver is protected at the connection level. Only
+ * one thread can be in a particular driver at one time.
  *
  * Level 3 - The driver is protected at the env level, only one thing
  * at a time.
  *
- * By default the driver open connections with a lock level of 0, 
- * drivers should be expecetd to be thread safe now.
- * this can be changed by adding the line
+ * By default the driver opens connections with lock level 0; drivers
+ * are expected to be thread safe now. This can be changed by adding
+ * the line
  *
  * Threading = N
  *
@@ -416,8 +416,8 @@
          * add to list of env handles
          */
 
-        environment -> next_class_list = enviroment_root;
-        enviroment_root = environment;
+        environment -> next_class_list = environment_root;
+        environment_root = environment;
         environment -> type = HENV_MAGIC;
 
         SQLGetPrivateProfileString( "ODBC", "Trace", "No",
@@ -491,7 +491,7 @@
 
     mutex_entry( &mutex_lists );
 
-    ptr = enviroment_root;
+    ptr = environment_root;
 
     while( ptr )
     {
@@ -522,7 +522,7 @@
 
     mutex_entry( &mutex_lists );
 
-    ptr = enviroment_root;
+    ptr = environment_root;
 
     while( ptr )
     {
@@ -542,7 +542,7 @@
         }
         else
         {
-            enviroment_root = ptr -> next_class_list;
+            environment_root = ptr -> next_class_list;
         }
     }
 
@@ -607,14 +607,14 @@
 #ifdef HAVE_LIBPTH
         pth_mutex_init( &connection -> mutex );
         /*
-        * for the moment protect on a environment level
-        */
+         * for the moment protect at the environment level
+         */
         connection -> protection_level = TS_LEVEL3;
 #elif HAVE_LIBPTHREAD
         pthread_mutex_init( &connection -> mutex, NULL );
         /*
-        * for the moment protect on a environment level
-        */
+         * for the moment protect at the environment level
+         */
         connection -> protection_level = TS_LEVEL3;
 #elif HAVE_LIBTHREAD
         mutex_init( &connection -> mutex, USYNC_THREAD, NULL );
Index: Drivers/MiniSQL/SQLFreeConnect.c
===================================================================
--- Drivers/MiniSQL/SQLFreeConnect.c	(revision 116)
+++ Drivers/MiniSQL/SQLFreeConnect.c	(working copy)
@@ -2,7 +2,7 @@
  * SQLFreeConnect
  *
  * Do not try to Free Dbc if there are Stmts... return an error. Let the
- * Driver Manager do a recursive clean up if its wants.
+ * Driver Manager do a recursive clean up if it wants.
  *
  **********************************************************************
  *
Index: Drivers/MiniSQL/sqlFreeConnect.c
===================================================================
--- Drivers/MiniSQL/sqlFreeConnect.c	(revision 96)
+++ Drivers/MiniSQL/sqlFreeConnect.c	(working copy)
@@ -2,7 +2,7 @@
  * sqlFreeConnect
  *
  * Do not try to Free Dbc if there are Stmts... return an error. Let the
- * Driver Manager do a recursive clean up if its wants.
+ * Driver Manager do a recursive clean up if it wants.
  *
  **********************************************************************
  *
Index: Drivers/template/SQLFreeConnect.c
===================================================================
--- Drivers/template/SQLFreeConnect.c	(revision 116)
+++ Drivers/template/SQLFreeConnect.c	(working copy)
@@ -2,7 +2,7 @@
  * SQLFreeConnect
  *
  * Do not try to Free Dbc if there are Stmts... return an error. Let the
- * Driver Manager do a recursive clean up if its wants.
+ * Driver Manager do a recursive clean up if it wants.
  *
  **********************************************************************
  *
Index: README
===================================================================
--- README	(revision 116)
+++ README	(working copy)
@@ -46,7 +46,7 @@
 	_odbcinst_UserINI.c
 	
 	In anycase; you can override where unixODBC looks for its system
-	config files by setting the ODBCSYSINI enviroment variable during 
+	config files by setting the ODBCSYSINI environment variable during 
 	the use of unixODBC.
       
 Resources:
Index: cur/SQLExecute.c
===================================================================
--- cur/SQLExecute.c	(revision 116)
+++ cur/SQLExecute.c	(working copy)
@@ -72,7 +72,7 @@
         cl_statement -> first_fetch_done = 0;
 
         /*
-         * if its a SELECT statement it will generate columns
+         * if it's a SELECT statement it will generate columns
          * WARNING a stored procedure could get here as well
          */
 
Index: cur/SQLExtendedFetch.c
===================================================================
--- cur/SQLExtendedFetch.c	(revision 116)
+++ cur/SQLExtendedFetch.c	(working copy)
@@ -335,7 +335,7 @@
 
                     /*
                      * Not quite sure if the check is valid, I think I can see where
-                     * I got it from, but not sure if its correct
+                     * I got it from, but not sure if it's correct
                      * 
                     if ( buffer && cbuf -> bound_ind && *cbuf -> bound_ind >= 0 )
                     */
Index: doc/AdministratorManual/odbcinst.html
===================================================================
--- doc/AdministratorManual/odbcinst.html	(revision 116)
+++ doc/AdministratorManual/odbcinst.html	(working copy)
@@ -179,7 +179,7 @@
 The individual entries of course may vary.
 
 <p>The Driver line is used to match the [section] entry in the odbcinst.ini
-file and the the Driver line in the odbcinst file is used to fine the
+file and the Driver line in the odbcinst file is used to find the
 path for the driver library, and this loaded and the connection is then
 established. It's possible to replace the driver entry with a path to
 the driver itself. This can be used, for example if the user can't get

--------------010501010808050405020909
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
unixODBC-dev mailing list
[email protected]
http://mailman.unixodbc.org/mailman/listinfo/unixodbc-dev

--------------010501010808050405020909--