Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Improve API armor integration. Fix harmless compiler warnings. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | get-trace |
Files: | files | file ages | folders |
SHA1: |
fbf29b453f8b49b6b21b8b0a9e09189e |
User & Date: | mistachkin 2015-05-12 23:28:03.074 |
Context
2015-05-12
| ||
23:31 | Fix a couple of typos in comments. (check-in: e908365fae user: mistachkin tags: get-trace) | |
23:28 | Improve API armor integration. Fix harmless compiler warnings. (check-in: fbf29b453f user: mistachkin tags: get-trace) | |
23:20 | Modify the new functions to make them return a standard return code. (check-in: 02f694d5ba user: mistachkin tags: get-trace) | |
Changes
Changes to src/main.c.
︙ | ︙ | |||
1767 1768 1769 1770 1771 1772 1773 | */ int sqlite3_get_trace( const sqlite3 *db, void (**pxTrace)(void*,const char*), void **ppArg ){ #ifdef SQLITE_ENABLE_API_ARMOR | | | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 | */ int sqlite3_get_trace( const sqlite3 *db, void (**pxTrace)(void*,const char*), void **ppArg ){ #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) || pxTrace==0 || ppArg==0 ){ return SQLITE_MISUSE_BKPT; } #endif *pxTrace = db->xTrace; *ppArg = db->pTraceArg; return SQLITE_OK; } |
︙ | ︙ | |||
1812 1813 1814 1815 1816 1817 1818 | */ int sqlite3_get_profile( const sqlite3 *db, void (**pxProfile)(void*,const char*,sqlite3_uint64), void **ppArg ){ #ifdef SQLITE_ENABLE_API_ARMOR | | | 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 | */ int sqlite3_get_profile( const sqlite3 *db, void (**pxProfile)(void*,const char*,sqlite3_uint64), void **ppArg ){ #ifdef SQLITE_ENABLE_API_ARMOR if( !sqlite3SafetyCheckOk(db) || pxProfile==0 || ppArg==0 ){ return SQLITE_MISUSE_BKPT; } #endif *pxProfile = db->xProfile; *ppArg = db->pProfileArg; return SQLITE_OK; } |
︙ | ︙ |
Changes to src/sqliteInt.h.
︙ | ︙ | |||
3380 3381 3382 3383 3384 3385 3386 | # define sqlite3SelectSetName(A,B) #endif void sqlite3FuncDefInsert(FuncDefHash*, FuncDef*); FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,int,u8,u8); void sqlite3RegisterBuiltinFunctions(sqlite3*); void sqlite3RegisterDateTimeFunctions(void); void sqlite3RegisterGlobalFunctions(void); | | | | 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 | # define sqlite3SelectSetName(A,B) #endif void sqlite3FuncDefInsert(FuncDefHash*, FuncDef*); FuncDef *sqlite3FindFunction(sqlite3*,const char*,int,int,u8,u8); void sqlite3RegisterBuiltinFunctions(sqlite3*); void sqlite3RegisterDateTimeFunctions(void); void sqlite3RegisterGlobalFunctions(void); int sqlite3SafetyCheckOk(const sqlite3*); int sqlite3SafetyCheckSickOrOk(const sqlite3*); void sqlite3ChangeCookie(Parse*, int); #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER) void sqlite3MaterializeView(Parse*, Table*, Expr*, int); #endif #ifndef SQLITE_OMIT_TRIGGER |
︙ | ︙ |
Changes to src/util.c.
︙ | ︙ | |||
1153 1154 1155 1156 1157 1158 1159 | ** SQLITE_MISUSE immediately. ** ** sqlite3SafetyCheckOk() requires that the db pointer be valid for ** use. sqlite3SafetyCheckSickOrOk() allows a db pointer that failed to ** open properly and is not fit for general use but which can be ** used as an argument to sqlite3_errmsg() or sqlite3_close(). */ | | | | 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 | ** SQLITE_MISUSE immediately. ** ** sqlite3SafetyCheckOk() requires that the db pointer be valid for ** use. sqlite3SafetyCheckSickOrOk() allows a db pointer that failed to ** open properly and is not fit for general use but which can be ** used as an argument to sqlite3_errmsg() or sqlite3_close(). */ int sqlite3SafetyCheckOk(const sqlite3 *db){ u32 magic; if( db==0 ){ logBadConnection("NULL"); return 0; } magic = db->magic; if( magic!=SQLITE_MAGIC_OPEN ){ if( sqlite3SafetyCheckSickOrOk(db) ){ testcase( sqlite3GlobalConfig.xLog!=0 ); logBadConnection("unopened"); } return 0; }else{ return 1; } } int sqlite3SafetyCheckSickOrOk(const sqlite3 *db){ u32 magic; magic = db->magic; if( magic!=SQLITE_MAGIC_SICK && magic!=SQLITE_MAGIC_OPEN && magic!=SQLITE_MAGIC_BUSY ){ testcase( sqlite3GlobalConfig.xLog!=0 ); logBadConnection("invalid"); |
︙ | ︙ |