Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a couple of compiler warnings in test_superlock.c. Add superlock.c to the Makefile.in used by the configure script. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
461f1a010f55e7da6b43ea65550066b1 |
User & Date: | drh 2010-11-24 13:04:22.000 |
Context
2010-11-26
| ||
15:17 | Merge fts3 matchinfo() changes with trunk. (check-in: 7d660b91b7 user: dan tags: trunk) | |
10:58 | Merge with latest trunk changes. (check-in: 515cb3f4e5 user: dan tags: fts3-experimental) | |
2010-11-24
| ||
13:04 | Fix a couple of compiler warnings in test_superlock.c. Add superlock.c to the Makefile.in used by the configure script. (check-in: 461f1a010f user: drh tags: trunk) | |
2010-11-23
| ||
20:55 | Cherry-pick the lemon.c updates out of the lemon-update-2010 branch into the trunk. (check-in: 1541ae3fbd user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | |||
369 370 371 372 373 374 375 376 377 378 379 380 381 382 | 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 | + | $(TOP)/src/test_onefile.c \ $(TOP)/src/test_osinst.c \ $(TOP)/src/test_pcache.c \ $(TOP)/src/test_quota.c \ $(TOP)/src/test_rtree.c \ $(TOP)/src/test_schema.c \ $(TOP)/src/test_server.c \ $(TOP)/src/test_superlock.c \ $(TOP)/src/test_stat.c \ $(TOP)/src/test_tclvar.c \ $(TOP)/src/test_thread.c \ $(TOP)/src/test_vfs.c \ $(TOP)/src/test_wsd.c # Source code to the library files needed by the test fixture |
︙ |
Changes to src/test_superlock.c.
︙ | |||
98 99 100 101 102 103 104 | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | - | static int superlockWalLock( sqlite3 *db, /* Database handle open on WAL database */ SuperlockBusy *pBusy /* Busy handler wrapper object */ ){ int rc; /* Return code */ sqlite3_file *fd = 0; /* Main database file handle */ void volatile *p = 0; /* Pointer to first page of shared memory */ |
︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 320 | 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 | + | } rc = sqlite3demo_superlock(zPath, zVfs, xBusy, &busy, &pLock); assert( rc==SQLITE_OK || pLock==0 ); assert( rc!=SQLITE_OK || pLock!=0 ); if( rc!=SQLITE_OK ){ extern const char *sqlite3ErrStr(int); Tcl_ResetResult(interp); Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0); return TCL_ERROR; } Tcl_CreateObjCommand( interp, Tcl_GetString(objv[1]), superunlock_cmd, pLock, superunlock_del |
︙ |