[sqlite] Annotate Chromium-specific exposed functions with SQLITE_API.

third_party/sqlite/patches/0006-Virtual-table-supporting-recovery-of-corrupted-datab.patch

-From 13a64d3c7fb541be8cb753c575837c1b84f5d9fd Mon Sep 17 00:00:00 2001
+From ec588be0416fab3e957d0901eb6e638543b01229 Mon Sep 17 00:00:00 2001
 From: Scott Hess <shess@chromium.org>
 Date: Sat, 20 Jul 2013 11:42:21 -0700
-Subject: [PATCH 06/16] Virtual table supporting recovery of corrupted
+Subject: [PATCH 06/11] Virtual table supporting recovery of corrupted
  databases.
 
 "recover" implements a virtual table which uses the SQLite pager layer
 to read table pages and pull out the data which is structurally sound
 (at least at the storage layer).
 
 BUG=109482
 
 Since this implements a new feature for SQLite, the review URLs aren't
 listed.  This patch and the top of recover.c should be considered
 authoritative.  The history is mostly under
 third_party/sqlite/src/src/{recover,recover-alt}.c .
 ---
  third_party/sqlite/src/Makefile.in         |    1 +
  third_party/sqlite/src/Makefile.linux-gcc  |    4 +
  third_party/sqlite/src/main.mk             |    4 +-
  third_party/sqlite/src/src/main.c          |    8 +
- third_party/sqlite/src/src/recover.c       | 2164 ++++++++++++++++++++++++++++
- third_party/sqlite/src/src/sqlite.h.in     |   11 +
+ third_party/sqlite/src/src/recover.c       | 2165 ++++++++++++++++++++++++++++
+ third_party/sqlite/src/src/sqlite.h.in     |   16 +
  third_party/sqlite/src/test/recover.test   |  147 ++
  third_party/sqlite/src/test/recover0.test  |  532 +++++++
  third_party/sqlite/src/test/recover1.test  |  429 ++++++
  third_party/sqlite/src/test/recover2.test  |  157 ++
  third_party/sqlite/src/tool/mksqlite3c.tcl |    2 +
- 11 files changed, 3458 insertions(+), 1 deletion(-)
+ 11 files changed, 3464 insertions(+), 1 deletion(-)
  create mode 100644 third_party/sqlite/src/src/recover.c
  create mode 100644 third_party/sqlite/src/test/recover.test
  create mode 100644 third_party/sqlite/src/test/recover0.test
  create mode 100644 third_party/sqlite/src/test/recover1.test
  create mode 100644 third_party/sqlite/src/test/recover2.test
 
 diff --git a/third_party/sqlite/src/Makefile.in b/third_party/sqlite/src/Makefile.in
 index a2213e8..1389486 100644
 --- a/third_party/sqlite/src/Makefile.in
 +++ b/third_party/sqlite/src/Makefile.in
 @@ -253,6 +253,7 @@ SRC = \
    $(TOP)/src/prepare.c \
    $(TOP)/src/printf.c \
    $(TOP)/src/random.c \
 +  $(TOP)/src/recover.c \
    $(TOP)/src/resolve.c \
    $(TOP)/src/rowset.c \
    $(TOP)/src/select.c \
 diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
-index 554bf56..e631816 100644
+index 4f6cdf1..dd8f46d 100644
 --- a/third_party/sqlite/src/Makefile.linux-gcc
 +++ b/third_party/sqlite/src/Makefile.linux-gcc
-@@ -82,6 +82,10 @@ OPTS += -DSQLITE_MEMDEBUG=1
+@@ -81,6 +81,10 @@ OPTS += -DSQLITE_MEMDEBUG=1
  # TODO(shess) I can't see why I need this setting.
  OPTS += -DOS_UNIX=1
  
 +# The recover virtual table is not generally enabled.  Enable it for testing
 +# purposes.
 +OPTS += -DDEFAULT_ENABLE_RECOVER=1
 +
  #### The suffix to add to executable files.  ".exe" for windows.
  #    Nothing for unix.
  #
@@ skipping 40 matching lines @@
 +  if( !db->mallocFailed && rc==SQLITE_OK ){
 +    rc = recoverVtableInit(db);
 +  }
 +#endif
 +
  #ifdef SQLITE_ENABLE_ICU
    if( !db->mallocFailed && rc==SQLITE_OK ){
      rc = sqlite3IcuInit(db);
 diff --git a/third_party/sqlite/src/src/recover.c b/third_party/sqlite/src/src/recover.c
 new file mode 100644
-index 0000000..c996d53
+index 0000000..6882d6f
 --- /dev/null
 +++ b/third_party/sqlite/src/src/recover.c
-@@ -0,0 +1,2164 @@
+@@ -0,0 +1,2165 @@
 +/*
 +** 2012 Jan 11
 +**
 +** The author disclaims copyright to this source code.  In place of
 +** a legal notice, here is a blessing:
 +**
 +**    May you do good and not evil.
 +**    May you find forgiveness for yourself and forgive others.
 +**    May you share freely, never taking more than you give.
 +*/
@@ skipping 1857 matching lines @@
 +  recoverRowid,              /* xRowid - read data */
 +  0,                         /* xUpdate - write data */
 +  0,                         /* xBegin - begin transaction */
 +  0,                         /* xSync - sync transaction */
 +  0,                         /* xCommit - commit transaction */
 +  0,                         /* xRollback - rollback transaction */
 +  0,                         /* xFindFunction - function overloading */
 +  0,                         /* xRename - rename the table */
 +};
 +
++CHROMIUM_SQLITE_API
 +int recoverVtableInit(sqlite3 *db){
 +  return sqlite3_create_module_v2(db, "recover", &recoverModule, NULL, 0);
 +}
 +
 +/* This section of code is for parsing the create input and
 + * initializing the module.
 + */
 +
 +/* Find the next word in zText and place the endpoints in pzWord*.
 + * Returns true if the word is non-empty.  "Word" is defined as
@@ skipping 268 matching lines @@
 +  sqlite3_free(zCreateSql);
 +  if( rc!=SQLITE_OK ){
 +    recoverRelease(pRecover);
 +    return rc;
 +  }
 +
 +  *ppVtab = (sqlite3_vtab *)pRecover;
 +  return SQLITE_OK;
 +}
 diff --git a/third_party/sqlite/src/src/sqlite.h.in b/third_party/sqlite/src/src/sqlite.h.in
-index f1d4e40..28b5ef1 100644
+index 36aa999..333adfe 100644
 --- a/third_party/sqlite/src/src/sqlite.h.in
 +++ b/third_party/sqlite/src/src/sqlite.h.in
-@@ -7408,6 +7408,17 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
+@@ -7408,6 +7408,22 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
  
  
  
-+/* Begin recover.patch for Chromium */
++/* Begin recover virtual table patch for Chromium */
++/* Our patches don't conform to SQLite's amalgamation processing. Hack it. */
++#ifndef CHROMIUM_SQLITE_API
++#define CHROMIUM_SQLITE_API SQLITE_API
++#endif
 +/*
 +** Call to initialize the recover virtual-table modules (see recover.c).
 +**
 +** This could be loaded by default in main.c, but that would make the
 +** virtual table available to Web SQL.  Breaking it out allows only
 +** selected users to enable it (currently sql/recovery.cc).
 +*/
++CHROMIUM_SQLITE_API
 +int recoverVtableInit(sqlite3 *db);
-+/* End recover.patch for Chromium */
++/* End recover virtual table patch for Chromium */
 +
- /*
- ** Undo the hack that converts floating point types to integer for
- ** builds on processors without floating point support.
+ /* Begin WebDatabase patch for Chromium */
+ /* Expose some SQLite internals for the WebDatabase vfs.
+ ** DO NOT EXTEND THE USE OF THIS.
 diff --git a/third_party/sqlite/src/test/recover.test b/third_party/sqlite/src/test/recover.test
 new file mode 100644
 index 0000000..b5aa182
 --- /dev/null
 +++ b/third_party/sqlite/src/test/recover.test
 @@ -0,0 +1,147 @@
 +# 2012 January 11 {}
 +#
 +# The author disclaims copyright to this source code.  In place of
 +# a legal notice, here is a blessing:
@@ skipping 1283 matching lines @@
 @@ -316,6 +316,8 @@ foreach file {
     main.c
     notify.c
  
 +   recover.c
 +
     fts3.c
     fts3_aux.c
     fts3_expr.c
 -- 
-2.2.1
+2.4.5