GNOME.org
 

libgda r3073 - in trunk: . libgda libgda/binreloc libgda/sql-parser libgda/sqlite/sqlite-src

Author: murrayc
Date: Tue Mar 11 17:40:43 2008
New Revision: 3073
URL: http://svn.gnome.org/viewvc/libgda?rev=3073&view=rev

Log:
2008-03-11  Murray Cumming  <murrayc murrayc com>

* libgda/binreloc/binreloc.c:
* libgda/gda-data-model.c:
* libgda/gda-server-operation.c:
* libgda/gda-value.c:
* libgda/sql-parser/gda-sql-parser.c:
* libgda/sqlite/sqlite-src/sqlite3.c: (writeJournalHdr),
(sqlite3PagerOpen), (sqlite3PagerReleaseMemory), (pager_write),
(sqlite3BtreeRollback), (vdbeCommit), (sqlite3VdbeHalt),
(sqlite3VdbeExec), (findCollSeqEntry), (sqlite3InitOne),
(sqlite3Fts3Init):
Documentation: Change mentions of occured to occurred, and mentions of 
a XML to an XML.
PaulSchulz and Malcolm Parsons in Ubuntu launchpad bug 64451 for 
some reason.

Modified:
   trunk/ChangeLog
   trunk/libgda/binreloc/binreloc.c
   trunk/libgda/gda-data-model.c
   trunk/libgda/gda-server-operation.c
   trunk/libgda/gda-value.c
   trunk/libgda/sql-parser/gda-sql-parser.c
   trunk/libgda/sqlite/sqlite-src/sqlite3.c

Modified: trunk/libgda/binreloc/binreloc.c
==============================================================================
--- trunk/libgda/binreloc/binreloc.c	(original)
+++ trunk/libgda/binreloc/binreloc.c	Tue Mar 11 17:40:43 2008
@@ -30,7 +30,7 @@
 /** @internal
  * Find the canonical filename of the executable. Returns the filename
  * (which must be freed) or NULL on error. If the parameter 'error' is
- * not NULL, the error code will be stored there, if an error occured.
+ * not NULL, the error code will be stored there, if an error occurred.
  */
 static char *
 _br_find_exe (GbrInitError *error)

Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c	(original)
+++ trunk/libgda/gda-data-model.c	Tue Mar 11 17:40:43 2008
@@ -1604,9 +1604,9 @@
 /**
  * gda_data_model_add_data_from_xml_node
  * @model: a #GdaDataModel.
- * @node: a XML node representing a &lt;gda_array_data&gt; XML node.
+ * @node: an XML node representing a &lt;gda_array_data&gt; XML node.
  *
- * Adds the data from a XML node to the given data model (see the DTD for that node
+ * Adds the data from an XML node to the given data model (see the DTD for that node
  * in the $prefix/share/libgda/dtd/libgda-array.dtd file).
  *
  * Returns: %TRUE if successful, %FALSE otherwise.

Modified: trunk/libgda/gda-server-operation.c
==============================================================================
--- trunk/libgda/gda-server-operation.c	(original)
+++ trunk/libgda/gda-server-operation.c	Tue Mar 11 17:40:43 2008
@@ -2036,7 +2036,7 @@
 /**
  * gda_server_operation_is_valid
  * @op: a #GdaServerOperation widget
- * @xml_file: a XML specification file (see gda_server_operation_new())
+ * @xml_file: an XML specification file (see gda_server_operation_new())
  * @error: a place to store an error, or %NULL
  *
  * Tells if all the required values in @op have been defined.

Modified: trunk/libgda/gda-value.c
==============================================================================
--- trunk/libgda/gda-value.c	(original)
+++ trunk/libgda/gda-value.c	Tue Mar 11 17:40:43 2008
@@ -1163,9 +1163,9 @@
 
 /**
  * gda_value_new_from_xml
- * @node: a XML node representing the value.
+ * @node: an XML node representing the value.
  *
- * Creates a GValue from a XML representation of it. That XML
+ * Creates a GValue from an XML representation of it. That XML
  * node corresponds to the following string representation:
  *    &lt;value type="gdatype"&gt;value&lt;/value&gt;
  *
@@ -2051,7 +2051,7 @@
  * gda_value_to_xml
  * @value: a #GValue.
  *
- * Serializes the given #GValue to a XML node string.
+ * Serializes the given #GValue to an XML node string.
  *
  * Returns: the XML node. Once not needed anymore, you should free it.
  */

Modified: trunk/libgda/sql-parser/gda-sql-parser.c
==============================================================================
--- trunk/libgda/sql-parser/gda-sql-parser.c	(original)
+++ trunk/libgda/sql-parser/gda-sql-parser.c	Tue Mar 11 17:40:43 2008
@@ -603,7 +603,7 @@
  * gda_sql_parser_parse_string_as_batch
  * @parser: a #GdaSqlParser object
  * @sql: the SQL string to parse
- * @remain: location to store a pointer to remaining part of @sql in case an error occured while parsing @sql, or %NULL
+ * @remain: location to store a pointer to remaining part of @sql in case an error occurred while parsing @sql, or %NULL
  * @error: location to store error, or %NULL
  *
  * Parse @sql and creates a #GdaBatch object which contains all the #GdaStatement objects created while parsing (one object

Modified: trunk/libgda/sqlite/sqlite-src/sqlite3.c
==============================================================================
--- trunk/libgda/sqlite/sqlite-src/sqlite3.c	(original)
+++ trunk/libgda/sqlite/sqlite-src/sqlite3.c	Tue Mar 11 17:40:43 2008
@@ -12363,10 +12363,10 @@
 ** sqlite3_realloc.
 **
 ** The returned value is normally a copy of the second argument to this
-** function. However, if a malloc() failure has occured since the previous
+** function. However, if a malloc() failure has occurred since the previous
 ** invocation SQLITE_NOMEM is returned instead. 
 **
-** If the first argument, db, is not NULL and a malloc() error has occured,
+** If the first argument, db, is not NULL and a malloc() error has occurred,
 ** then the connection error-code (the value returned by sqlite3_errcode())
 ** is set to SQLITE_NOMEM.
 */
@@ -22182,7 +22182,7 @@
 ** A persistent error indicates that the contents of the pager-cache 
 ** cannot be trusted. This state can be cleared by completely discarding 
 ** the contents of the pager-cache. If a transaction was active when
-** the persistent error occured, then the rollback journal may need
+** the persistent error occurred, then the rollback journal may need
 ** to be replayed.
 */
 static void pager_unlock(Pager *pPager);
@@ -22377,7 +22377,7 @@
   ** A faster alternative is to write 0xFFFFFFFF to the nRec field. When
   ** reading the journal this value tells SQLite to assume that the
   ** rest of the journal file contains valid page records. This assumption
-  ** is dangerous, as if a failure occured whilst writing to the journal
+  ** is dangerous, as if a failure occurred whilst writing to the journal
   ** file it may contain some garbage data. There are two scenarios
   ** where this risk can be ignored:
   **
@@ -23570,7 +23570,7 @@
     pPager->pTmpSpace = (char *)sqlite3_malloc(nDefaultPage);
   }
 
-  /* If an error occured in either of the blocks above.
+  /* If an error occurred in either of the blocks above.
   ** Free the Pager structure and close the file.
   ** Since the pager is not allocated there is no need to set 
   ** any Pager.errMask variables.
@@ -24592,11 +24592,11 @@
       sqlite3_free(pPg);
       pPager->nPage--;
     }else{
-      /* An error occured whilst writing to the database file or 
+      /* An error occurred whilst writing to the database file or 
       ** journal in pager_recycle(). The error is not returned to the 
       ** caller of this function. Instead, set the Pager.errCode variable.
       ** The error will be returned to the user (or users, in the case 
-      ** of a shared pager cache) of the pager for which the error occured.
+      ** of a shared pager cache) of the pager for which the error occurred.
       */
       assert(
           (rc&0xff)==SQLITE_IOERR ||
@@ -25473,7 +25473,7 @@
           PAGERTRACE5("JOURNAL %d page %d needSync=%d hash(%08x)\n",
                PAGERID(pPager), pPg->pgno, pPg->needSync, pager_pagehash(pPg));
 
-          /* An error has occured writing to the journal file. The 
+          /* An error has occurred writing to the journal file. The 
           ** transaction will be rolled back by the layer above.
           */
           if( rc!=SQLITE_OK ){
@@ -29712,7 +29712,7 @@
 ** It performs a single unit of work towards an incremental vacuum.
 **
 ** If the incremental vacuum is finished after this function has run,
-** SQLITE_DONE is returned. If it is not finished, but no error occured,
+** SQLITE_DONE is returned. If it is not finished, but no error occurred,
 ** SQLITE_OK is returned. Otherwise an SQLite error code. 
 */
 SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){
@@ -29996,7 +29996,7 @@
   rc = saveAllCursors(pBt, 0, 0);
 #ifndef SQLITE_OMIT_SHARED_CACHE
   if( rc!=SQLITE_OK ){
-    /* This is a horrible situation. An IO or malloc() error occured whilst
+    /* This is a horrible situation. An IO or malloc() error occurred whilst
     ** trying to save cursor positions. If this is an automatic rollback (as
     ** the result of a constraint, malloc() failure or IO error) then 
     ** the cache may be internally inconsistent (not contain valid trees) so
@@ -36875,7 +36875,7 @@
     ** sqlite3BtreeCommitPhaseOne(), then there is a chance that the
     ** master journal file will be orphaned. But we cannot delete it,
     ** in case the master journal file name was written into the journal
-    ** file before the failure occured.
+    ** file before the failure occurred.
     */
     for(i=0; rc==SQLITE_OK && i<db->nDb; i++){ 
       Btree *pBt = db->aDb[i].pBt;
@@ -37083,7 +37083,7 @@
     ** we do either a commit or rollback of the current transaction. 
     **
     ** Note: This block also runs if one of the special errors handled 
-    ** above has occured. 
+    ** above has occurred. 
     */
     if( db->autoCommit && db->activeVdbeCnt==1 ){
       if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){
@@ -40059,7 +40059,7 @@
         ** some architectures, the value overflows to (1<<63). On others,
         ** a SIGFPE is issued. The following statement normalizes this
         ** behaviour so that all architectures behave as if integer 
-        ** overflow occured.
+        ** overflow occurred.
         */
         if( a==-1 && b==(((i64)1)<<63) ) a = 1;
         b /= a;
@@ -43504,7 +43504,7 @@
   rc = pModule->xColumn(pCur->pVtabCursor, &sContext, pOp->p2);
 
   /* Copy the result of the function to the P3 register. We
-  ** do this regardless of whether or not an error occured to ensure any
+  ** do this regardless of whether or not an error occurred to ensure any
   ** dynamic allocation in sContext.s (a Mem struct) is  released.
   */
   sqlite3VdbeChangeEncoding(&sContext.s, encoding);
@@ -52813,7 +52813,7 @@
       pColl[0].zName[nName] = 0;
       pDel = sqlite3HashInsert(&db->aCollSeq, pColl[0].zName, nName, pColl);
 
-      /* If a malloc() failure occured in sqlite3HashInsert(), it will 
+      /* If a malloc() failure occurred in sqlite3HashInsert(), it will 
       ** return the pColl pointer to be deleted (because it wasn't added
       ** to the hash table).
       */
@@ -59371,10 +59371,10 @@
   }
   if( rc==SQLITE_OK || (db->flags&SQLITE_RecoveryMode)){
     /* Black magic: If the SQLITE_RecoveryMode flag is set, then consider
-    ** the schema loaded, even if errors occured. In this situation the 
+    ** the schema loaded, even if errors occurred. In this situation the 
     ** current sqlite3_prepare() operation will fail, but the following one
     ** will attempt to compile the supplied statement against whatever subset
-    ** of the schema was loaded before the error occured. The primary
+    ** of the schema was loaded before the error occurred. The primary
     ** purpose of this is to allow access to the sqlite_master table
     ** even when its contents have been corrupted.
     */
@@ -81297,7 +81297,7 @@
     );
   }
 
-  /* An error has occured. Delete the hash table and return the error code. */
+  /* An error has occurred. Delete the hash table and return the error code. */
   assert( rc!=SQLITE_OK );
   if( pHash ){
     sqlite3Fts3HashClear(pHash);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]