From: mistachkin <mistachkin@noemail.net>
Date: Thu, 9 May 2013 00:40:13 +0000 (+0000)
Subject: Refine and reform all Windows OSTRACE macro usage.  Replace all usage of sqlite3TestE... 
X-Git-Tag: version-3.7.17~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bf3bc6c64fe45a0b3cf3e2b6c2e45441e1e98db;p=thirdparty%2Fsqlite.git

Refine and reform all Windows OSTRACE macro usage.  Replace all usage of sqlite3TestErrorName() with sqlite3ErrName() and add missing return codes.

FossilOrigin-Name: 610425f19008b8b5d4bf027c8b14d97ec3115a54
---

0bf3bc6c64fe45a0b3cf3e2b6c2e45441e1e98db
diff --cc manifest
index e9fbbc3ca6,32b927c8f1..e6aa18a66a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\scouple\sof\sharmless\scompiler\swarnings\sin\sthe\sfts3_tokenize\svirtual\ntable.
- D 2013-05-08T17:06:28.377
 -C Add\sthe\s#ifdefs\sfor\ssqlite3ErrName()\sto\ssqliteInt.h\sas\swell.
 -D 2013-04-30T07:58:15.668
++C Refine\sand\sreform\sall\sWindows\sOSTRACE\smacro\susage.\s\sReplace\sall\susage\sof\ssqlite3TestErrorName()\swith\ssqlite3ErrName()\sand\sadd\smissing\sreturn\scodes.
++D 2013-05-09T00:40:13.506
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -176,11 -175,11 +176,11 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 -F src/os_unix.c 5a214c5431fd005dbb3b8bbaaa306433e8e9b48f
 +F src/os_unix.c 658b180a09a18214d94547f737dbded71667cdab
- F src/os_win.c 673b3e3d1fa3040d8d95a7f1f5e0e553aed56cfb
+ F src/os_win.c bf297963be89f9cddab53c3356e79daa3b8240d2
 -F src/pager.c 4a9160d268977e56ae2df90182050ab30fca715d
 +F src/pager.c 49e23f9898113ddfe90942bdf1c1ef57955d0921
  F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 -F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95
 +F src/parse.y 9708365594eea519cdc8504dee425c0a41c79502
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9
@@@ -190,12 -189,12 +190,12 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 83cc2d942ee216bc56956c6e6fadb691c1727fa1
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 -F src/select.c 6bfbe11e2fef81c5e18d30513ab6c69f171667eb
 -F src/shell.c 5d527e5d08f05ec2c43ff194ea44bf62b974f4c9
 -F src/sqlite.h.in e6c241170da854abf6f15ec7e6c565348b690169
 +F src/select.c a4641882279becc200f2680f55f3e89d4e7c7f78
 +F src/shell.c 2109d54f67c815a100abd7dc6a6e25eddb3b97eb
 +F src/sqlite.h.in 5a5a22a9b192d81a9e5dee00274e3a0484c4afb1
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h de835c584032769461c123a564381f9808542c0e
+ F src/sqliteInt.h 4cc782c9a89b3ddd663e7f68af3fa9e5af596f8b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1062,7 -1060,7 +1062,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P ce853a75068073d6acc8bec0819505a22c4c7e69
- R 693e66fc26b30225620a1dd87e0b79b3
- U drh
- Z a746215c07dfe5ad61be18a3c8d6b29d
 -P e47cd314371c2be6e00d96392b3892a7f3015f98
 -R 70f2f4bd9f342d0b45d8fabecab1b397
++P 1fa8c457394c94864f7584e4c893ec09e685fba4 400fc4c37ff34e84f5a129a083a567bda840278e
++R a3f98c872243f05bc78c5a52c22d5a59
+ U mistachkin
 -Z 9f1f55618d07d0d16d8083682b6c561d
++Z 68d84fd2c9e0a14b0e1248a70789d361
diff --cc manifest.uuid
index 00a6e72965,f21e9ab5ca..bc648b3196
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1fa8c457394c94864f7584e4c893ec09e685fba4
 -400fc4c37ff34e84f5a129a083a567bda840278e
++610425f19008b8b5d4bf027c8b14d97ec3115a54