From: dan <dan@noemail.net>
Date: Thu, 16 Apr 2015 14:33:09 +0000 (+0000)
Subject: Fix a mismatched printf() argument and format specifier. Add ota files to Makefile.in.
X-Git-Tag: version-3.8.11~252^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b22a0159eec9e5c55d494ca2e301a1a44113ab;p=thirdparty%2Fsqlite.git

Fix a mismatched printf() argument and format specifier. Add ota files to Makefile.in.

FossilOrigin-Name: 5db810a88dac5cbf1f6b321345d01cc0d9d05d31
---

diff --git a/Makefile.in b/Makefile.in
index 295a6bc9c1..b6db0177f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,6 +338,9 @@ SRC += \
 SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
+SRC += \
+  $(TOP)/ext/ota/sqlite3ota.h \
+  $(TOP)/ext/ota/sqlite3ota.c
 
 
 # Generated source code files
@@ -395,7 +398,8 @@ TESTSRC = \
   $(TOP)/src/test_vfs.c \
   $(TOP)/src/test_wsd.c       \
   $(TOP)/ext/fts3/fts3_term.c \
-  $(TOP)/ext/fts3/fts3_test.c 
+  $(TOP)/ext/fts3/fts3_test.c \
+  $(TOP)/ext/ota/test_ota.c 
 
 # Statically linked extensions
 #
diff --git a/ext/ota/sqlite3ota.c b/ext/ota/sqlite3ota.c
index 86eca8cff3..580840b36a 100644
--- a/ext/ota/sqlite3ota.c
+++ b/ext/ota/sqlite3ota.c
@@ -2295,7 +2295,7 @@ static void otaSaveState(sqlite3ota *p, int eStage){
           "(%d, %Q), "
           "(%d, %Q), "
           "(%d, %d), "
-          "(%d, %lld), "
+          "(%d, %d), "
           "(%d, %lld), "
           "(%d, %lld), "
           "(%d, %lld) ",
diff --git a/manifest b/manifest
index b3e8e485d0..74fa58f17a 100644
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Avoid\sattempting\sto\srename\sthe\s*-oal\sfile\swhile\sit\sis\sstill\sopen.
-D 2015-04-16T10:55:58.879
+C Fix\sa\smismatched\sprintf()\sargument\sand\sformat\sspecifier.\sAdd\sota\sfiles\sto\sMakefile.in.
+D 2015-04-16T14:33:09.849
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
+F Makefile.in 79b306896135a2305cfb7e6d88990fc4820fb917
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -138,7 +138,7 @@ F ext/ota/otaA.test ef4bfa8cfd4ed814ae86f7457b64aa2f18c90171
 F ext/ota/otacrash.test a078d34e2edbcedac5f894e3e7d08d452a327007
 F ext/ota/otafault.test 8c43586c2b96ca16bbce00b5d7e7d67316126db8
 F ext/ota/otafault2.test fa202a98ca221faec318f3e5c5f39485b1256561
-F ext/ota/sqlite3ota.c 8c0d30482bf31fe31d3bb565cf8f8271244dd57d
+F ext/ota/sqlite3ota.c 876445eb19a9d4b53a6c79e604748542d935f528
 F ext/ota/sqlite3ota.h f1a9dd98b00fa622c7e2eb68e580ee02e194c4d6
 F ext/ota/test_ota.c e34c801c665d64b4b9e00b71f1acf8c652404b2b
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
@@ -1269,7 +1269,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9bd3e4453d4ad416f7e3f08f0bd283d34f1c319c
-R 4663dac775a3f1bb6d41bcf6b3ecb7b2
+P 658c3b0c80b9fe7eaac5982573651dc649a4c53f
+R 7c644ea03a0ef90234d338e031f21ca5
 U dan
-Z 579dc8fee06cffd2aee7945473c8d821
+Z 85db6025ab0c4250cca566f7a293b04a
diff --git a/manifest.uuid b/manifest.uuid
index 6f939748e3..9d0960e97a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-658c3b0c80b9fe7eaac5982573651dc649a4c53f
\ No newline at end of file
+5db810a88dac5cbf1f6b321345d01cc0d9d05d31
\ No newline at end of file