From: mistachkin <mistachkin@noemail.net>
Date: Tue, 12 May 2015 23:20:23 +0000 (+0000)
Subject: Modify the new functions to make them return a standard return code.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ff6032b153eb2910d916aa8f06b248275ee6b66;p=thirdparty%2Fsqlite.git

Modify the new functions to make them return a standard return code.

FossilOrigin-Name: 02f694d5babe5fc03a4fcec001e3d878fa58f2c8
---

diff --git a/manifest b/manifest
index 91ae002aa3..b91e2dad2d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\sAPI\sextension\sfor\srecovering\sthe\scurrent\strace\sand\sprofile\ncallbacks\son\sa\sdatabase\sconnection.
-D 2015-05-12T21:27:36.902
+C Modify\sthe\snew\sfunctions\sto\smake\sthem\sreturn\sa\sstandard\sreturn\scode.
+D 2015-05-12T23:20:23.636
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in edfc69769e613a6359c42c06ea1d42c3bece1736
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -196,7 +196,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271
-F src/main.c a6a22e9ec8d7e54f323bf9149e7f0fdf67aa3d11
+F src/main.c 3924dad8a0e8d84ce8b76cc1d1c0fa855cd1a75e
 F src/malloc.c 5bc15d525811d387b37c29f2e368143460e41e96
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@ -233,7 +233,7 @@ F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c 1b0bfc7d59e48c26b895a6b719157111a617d9e3
 F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee
-F src/sqlite.h.in 495d16a58094ca33960fcf0eedf9fe2174f05629
+F src/sqlite.h.in 87908d43d02f8b813b151e3586da22f2a6fa12ed
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
 F src/sqliteInt.h c9f77bd02f419dcc8c644c5032c42eb29069a545
@@ -1258,10 +1258,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 c3cbe3b06eb37b9949c5fcb0e257a845953de7a7
-R 7b971252f0e6e36e3477063424ac6a4e
-T *branch * get-trace
-T *sym-get-trace *
-T -sym-trunk *
-U drh
-Z cac1a8bc14d080a1fbd9585c6a532a77
+P 9de33768fff2d8952fdff552d918da96e5267e5d
+R ad2fc56380a12ce4e3217459fe073178
+U mistachkin
+Z cc261669363b61aef345a3c4f20016ef
diff --git a/manifest.uuid b/manifest.uuid
index 4ba24aa24d..6fdcf73ff4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9de33768fff2d8952fdff552d918da96e5267e5d
\ No newline at end of file
+02f694d5babe5fc03a4fcec001e3d878fa58f2c8
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 3ffca40acd..a2b3fff9ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1765,19 +1765,19 @@ void *sqlite3_trace(sqlite3 *db, void (*xTrace)(void*,const char*), void *pArg){
 /*
 ** Return the curren trace function and argument.
 */
-void sqlite3_get_trace(
+int sqlite3_get_trace(
   const sqlite3 *db,
   void (**pxTrace)(void*,const char*),
   void **ppArg
 ){
 #ifdef SQLITE_ENABLE_API_ARMOR
   if( !sqlite3SafetyCheckOk(db) ){
-    (void)SQLITE_MISUSE_BKPT;
-    return 0;
+    return SQLITE_MISUSE_BKPT;
   }
 #endif
   *pxTrace = db->xTrace;
   *ppArg = db->pTraceArg;
+  return SQLITE_OK;
 }
 /*
 ** Register a profile function.  The pArg from the previously registered 
@@ -1810,19 +1810,19 @@ void *sqlite3_profile(
 /*
 ** Return the curren trace function and argument.
 */
-void sqlite3_get_profile(
+int sqlite3_get_profile(
   const sqlite3 *db,
   void (**pxProfile)(void*,const char*,sqlite3_uint64),
   void **ppArg
 ){
 #ifdef SQLITE_ENABLE_API_ARMOR
   if( !sqlite3SafetyCheckOk(db) ){
-    (void)SQLITE_MISUSE_BKPT;
-    return 0;
+    return SQLITE_MISUSE_BKPT;
   }
 #endif
   *pxProfile = db->xProfile;
   *ppArg = db->pProfileArg;
+  return SQLITE_OK;
 }
 #endif /* SQLITE_OMIT_TRACE */
 
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index dbecc99ea1..1c5dbdbc54 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2709,8 +2709,8 @@ int sqlite3_set_authorizer(
 void *sqlite3_trace(sqlite3*, void(*xTrace)(void*,const char*), void*);
 void *sqlite3_profile(sqlite3*,
    void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
-void sqlite3_get_trace(const sqlite3*, void(**)(void*,const char*),void**);
-void sqlite3_get_profile(const sqlite3*,
+int sqlite3_get_trace(const sqlite3*, void(**)(void*,const char*),void**);
+int sqlite3_get_profile(const sqlite3*,
    void(**)(void*,const char*,sqlite3_uint64),void**);
 
 /*