From f5628d782590e2807f3ad8125e2936642cac7c35 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Fri, 18 Jun 2004 11:34:09 +0000 Subject: [PATCH] Fix typos in capi3.tcl (CVS 1618) FossilOrigin-Name: 9e0e530f10bf70996471650496173dee074c2732 --- manifest | 14 +++++++------- manifest.uuid | 2 +- www/capi3.tcl | 44 ++++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/manifest b/manifest index 026f845dc1..96e3c0eeee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sMakefile.in,\sversion\snumber,\schange\slog,\setc\sfor\sthe\s3.0.0\nrelease.\s(CVS\s1617) -D 2004-06-18T11:29:36 +C Fix\stypos\sin\scapi3.tcl\s(CVS\s1618) +D 2004-06-18T11:34:09 F Makefile.in 5125bd6b92fca76275a6fc6c6ff425484b8cec0a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -193,7 +193,7 @@ F www/arch2.fig 613b5ac63511109064c2f93c5754ee662219937d F www/arch2.gif 49c6bb36160f03ca2b89eaa5bfb1f560c7d68ee7 F www/audit.tcl 90e09d580f79c7efec0c7d6f447b7ec5c2dce5c0 F www/c_interface.tcl 2176519fc2bd2d2cf6fe74fd806fc2d8362de2c8 -F www/capi3.tcl 9e6a4b21f464d84b385dd5e78292880fc74a47ab +F www/capi3.tcl af6938cc417fe323d7570b95d2e9a019bbff637e F www/capi3ref.tcl 68a03fa5c15f01d04fbb073f8153078f1ba6f672 F www/changes.tcl 4d75f4c2a8bba2bb26b0fd4f3a48999e06b4025f F www/common.tcl f786e6be86fb2627ceb30e770e9efa83b9c67a3a @@ -225,7 +225,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl f9a4c1a12864e129f6717d22313be01d5657e3aa F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 61db159c7d1d971266e487d44e3eb5bf6ac9a8e3 -R e6fbb42a68049b9de9558297a2c68e0d -U drh -Z ecac902f72be9022c498944e0133e800 +P 917391e05ef45fd1eae883a99e6bbe6d7df3cc1c +R e652117e65d118a6c36b9df849e95e4a +U danielk1977 +Z 65641b4e96f5d9c91c06d2c81c03a7c6 diff --git a/manifest.uuid b/manifest.uuid index e80e21ddf7..914016509d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -917391e05ef45fd1eae883a99e6bbe6d7df3cc1c \ No newline at end of file +9e0e530f10bf70996471650496173dee074c2732 \ No newline at end of file diff --git a/www/capi3.tcl b/www/capi3.tcl index 920688b1b1..58028e4d6f 100644 --- a/www/capi3.tcl +++ b/www/capi3.tcl @@ -1,4 +1,4 @@ -set rcsid {$Id: capi3.tcl,v 1.4 2004/06/17 19:04:17 drh Exp $} +set rcsid {$Id: capi3.tcl,v 1.5 2004/06/18 11:34:09 danielk1977 Exp $} source common.tcl header {C/C++ Interface For SQLite Version 3} puts { @@ -7,11 +7,10 @@ puts {

1.0 Overview

-SQLite version 3.0 will be a new version of SQLite, derived from +SQLite version 3.0 is a new version of SQLite, derived from the SQLite 2.8.13 code base, but with an incompatible file format and API. -SQLite version 3.0 is intended to answer the increasing demand -for the following features: +SQLite version 3.0 was created to answer demand for the following features:

-It became necessary to move to version 3.0 -to implement these features because each -requires incompatible changes to the database file format. Other -incompatible changes, such as a cleanup of the API, were introduced -at the same time under the theory that it is best to get your -incompatible changes out of the way all at once. +It was necessary to move to version 3.0 to implement these features because +each requires incompatible changes to the database file format. Other +incompatible changes, such as a cleanup of the API, were introduced at the +same time under the theory that it is best to get your incompatible changes +out of the way all at once.

The API for version 3.0 is similar to the version 2.X API, but with some important changes. Most noticeably, the "sqlite_" prefix that occurs on the beginning of all API functions and data -structures will be changed to "sqlite3_". -This will avoid confusion between the two APIs and allow -linking against both SQLite 2.X and SQLite 3.0 at the same time, -if desired. +structures are changed to "sqlite3_". +This avoids confusion between the two APIs and allows linking against both +SQLite 2.X and SQLite 3.0 at the same time.

There is no agreement on what the C datatype for a UTF-16 string should be. Therefore, SQLite uses a generic type of void* -to refer to UTF-16 strings. -Client software can cast the void* +to refer to UTF-16 strings. Client software can cast the void* to whatever datatype is appropriate for their system.

@@ -92,8 +88,8 @@ a pointer to the sqlite3 structure as the version 2 interface did. The difference between sqlite3_open() and sqlite3_open16() is that sqlite3_open16() takes UTF-16 (in host native byte order) for the name of the database file. If a new database file -needs to be created, then sqlite3_open16() will set the internal text -representation to UTF-16 whereas sqlite3_open() will set the text +needs to be created, then sqlite3_open16() sets the internal text +representation to UTF-16 whereas sqlite3_open() sets the text representation to UTF-8.

@@ -105,10 +101,10 @@ set using PRAGMA statements.

-The sqlite3_errcode() routine will return the result code for the most -recent major API call. sqlite3_errmsg() will return an English-language -text error message for the most recent error. The error message will -be represented in UTF-8 and will be ephemeral - it could disappear on +The sqlite3_errcode() routine returns a result code for the most +recent major API call. sqlite3_errmsg() returns an English-language +text error message for the most recent error. The error message is +represented in UTF-8 and will be ephemeral - it could disappear on the next call to any SQLite API function. sqlite3_errmsg16() works like sqlite3_errmsg() except that it returns the error message represented as UTF-16 in host native byte order. @@ -178,8 +174,8 @@ calls to the prepared statement interface.

The sqlite3_prepare interface compiles a single SQL statement into byte code -for later execution. -This interface is now the preferred way of accessing the database. +for later execution. This interface is now the preferred way of accessing +the database.