Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More compiler warning fixes for GCC related to the auto-extension mechanism. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | callbackConv |
| Files: | files | file ages | folders |
| SHA1: |
b8218129bc848c61fa6910feae4141da |
| User & Date: | mistachkin 2016-07-28 22:53:10 |
Context
|
2016-07-28
| ||
| 23:54 | Use the SQLITE_TCLAPI macro in several extensions that were missed in the previous check-in. check-in: df254365 user: mistachkin tags: callbackConv | |
| 22:53 | More compiler warning fixes for GCC related to the auto-extension mechanism. check-in: b8218129 user: mistachkin tags: callbackConv | |
| 22:46 | The return type used by the auto-extension entry points is 'int', not 'void'. check-in: bf9c86c7 user: mistachkin tags: callbackConv | |
Changes
Changes to src/tclsqlite.c.
3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 |
MD5Final(digest,p);
MD5DigestToBase16(digest, zBuf);
sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
}
int Md5_Register(
sqlite3 *db,
char **pzErrMsg,
const void *pThunk
){
int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0,
md5step, md5finalize);
sqlite3_overload_function(db, "md5sum", -1); /* To exercise this API */
return rc;
}
#endif /* defined(SQLITE_TEST) */
|
| |
3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 |
MD5Final(digest,p);
MD5DigestToBase16(digest, zBuf);
sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
}
int Md5_Register(
sqlite3 *db,
char **pzErrMsg,
const sqlite3_api_routines *pThunk
){
int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0,
md5step, md5finalize);
sqlite3_overload_function(db, "md5sum", -1); /* To exercise this API */
return rc;
}
#endif /* defined(SQLITE_TEST) */
|
Changes to src/test_func.c.
643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 ... 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 ... 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 |
sqlite3_result_value(context, argv[0]); sqlite3_result_subtype(context, (unsigned int)sqlite3_value_int(argv[1])); } static int registerTestFunctions( sqlite3 *db, char **pzErrMsg, const void *pThunk ){ static const struct { char *zName; signed char nArg; unsigned int eTextRep; /* 1: UTF-16. 0: UTF-8 */ void (*xFunc)(sqlite3_context*,int,sqlite3_value **); } aFuncs[] = { ................................................................................ */ static int SQLITE_TCLAPI autoinstall_test_funcs( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ extern int Md5_Register(sqlite3 *, char **, const void *); int rc = sqlite3_auto_extension(registerTestFunctions); if( rc==SQLITE_OK ){ rc = sqlite3_auto_extension(Md5_Register); } Tcl_SetObjResult(interp, Tcl_NewIntObj(rc)); return TCL_OK; } ................................................................................ char *zName; Tcl_ObjCmdProc *xProc; } aObjCmd[] = { { "autoinstall_test_functions", autoinstall_test_funcs }, { "abuse_create_function", abuse_create_function }, }; int i; extern int Md5_Register(sqlite3 *, char **, const void *); for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){ Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, 0, 0); } sqlite3_initialize(); sqlite3_auto_extension(registerTestFunctions); sqlite3_auto_extension(Md5_Register); return TCL_OK; } |
| | | |
643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 ... 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 ... 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 |
sqlite3_result_value(context, argv[0]); sqlite3_result_subtype(context, (unsigned int)sqlite3_value_int(argv[1])); } static int registerTestFunctions( sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pThunk ){ static const struct { char *zName; signed char nArg; unsigned int eTextRep; /* 1: UTF-16. 0: UTF-8 */ void (*xFunc)(sqlite3_context*,int,sqlite3_value **); } aFuncs[] = { ................................................................................ */ static int SQLITE_TCLAPI autoinstall_test_funcs( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *); int rc = sqlite3_auto_extension(registerTestFunctions); if( rc==SQLITE_OK ){ rc = sqlite3_auto_extension(Md5_Register); } Tcl_SetObjResult(interp, Tcl_NewIntObj(rc)); return TCL_OK; } ................................................................................ char *zName; Tcl_ObjCmdProc *xProc; } aObjCmd[] = { { "autoinstall_test_functions", autoinstall_test_funcs }, { "abuse_create_function", abuse_create_function }, }; int i; extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *); for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){ Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, 0, 0); } sqlite3_initialize(); sqlite3_auto_extension(registerTestFunctions); sqlite3_auto_extension(Md5_Register); return TCL_OK; } |
Changes to src/test_thread.c.
276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
Tcl_Obj *CONST objv[]
){
int sqlite3TestMakePointerStr(Tcl_Interp *interp, char *zPtr, void *p);
const char *zFilename;
sqlite3 *db;
char zBuf[100];
extern int Md5_Register(sqlite3 *, char **, const void *);
UNUSED_PARAMETER(clientData);
UNUSED_PARAMETER(objc);
zFilename = Tcl_GetString(objv[2]);
sqlite3_open(zFilename, &db);
#ifdef SQLITE_HAS_CODEC
|
| |
276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
Tcl_Obj *CONST objv[]
){
int sqlite3TestMakePointerStr(Tcl_Interp *interp, char *zPtr, void *p);
const char *zFilename;
sqlite3 *db;
char zBuf[100];
extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *);
UNUSED_PARAMETER(clientData);
UNUSED_PARAMETER(objc);
zFilename = Tcl_GetString(objv[2]);
sqlite3_open(zFilename, &db);
#ifdef SQLITE_HAS_CODEC
|