/ Check-in [461f1a01]
Login

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 | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 461f1a010f55e7da6b43ea65550066b1ca7abad0
User & Date: drh 2010-11-24 13:04:22
Context
2010-11-26
15:17
Merge fts3 matchinfo() changes with trunk. check-in: 7d660b91 user: dan tags: trunk
10:58
Merge with latest trunk changes. check-in: 515cb3f4 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: 461f1a01 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: 1541ae3f user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

   369    369     $(TOP)/src/test_onefile.c \
   370    370     $(TOP)/src/test_osinst.c \
   371    371     $(TOP)/src/test_pcache.c \
   372    372     $(TOP)/src/test_quota.c \
   373    373     $(TOP)/src/test_rtree.c \
   374    374     $(TOP)/src/test_schema.c \
   375    375     $(TOP)/src/test_server.c \
          376  +  $(TOP)/src/test_superlock.c \
   376    377     $(TOP)/src/test_stat.c \
   377    378     $(TOP)/src/test_tclvar.c \
   378    379     $(TOP)/src/test_thread.c \
   379    380     $(TOP)/src/test_vfs.c \
   380    381     $(TOP)/src/test_wsd.c
   381    382   
   382    383   # Source code to the library files needed by the test fixture

Changes to src/test_superlock.c.

    98     98   static int superlockWalLock(
    99     99     sqlite3 *db,                    /* Database handle open on WAL database */
   100    100     SuperlockBusy *pBusy            /* Busy handler wrapper object */
   101    101   ){
   102    102     int rc;                         /* Return code */
   103    103     sqlite3_file *fd = 0;           /* Main database file handle */
   104    104     void volatile *p = 0;           /* Pointer to first page of shared memory */
   105         -  int nBusy = 0;                  /* Number of calls already made to xBusy */
   106    105   
   107    106     /* Obtain a pointer to the sqlite3_file object open on the main db file. */
   108    107     rc = sqlite3_file_control(db, "main", SQLITE_FCNTL_FILE_POINTER, (void *)&fd);
   109    108     if( rc!=SQLITE_OK ) return rc;
   110    109   
   111    110     /* Obtain the "recovery" lock. Normally, this lock is only obtained by
   112    111     ** clients running database recovery.  
................................................................................
   307    306     }
   308    307   
   309    308     rc = sqlite3demo_superlock(zPath, zVfs, xBusy, &busy, &pLock);
   310    309     assert( rc==SQLITE_OK || pLock==0 );
   311    310     assert( rc!=SQLITE_OK || pLock!=0 );
   312    311   
   313    312     if( rc!=SQLITE_OK ){
          313  +    extern const char *sqlite3ErrStr(int);
   314    314       Tcl_ResetResult(interp);
   315    315       Tcl_AppendResult(interp, sqlite3ErrStr(rc), 0);
   316    316       return TCL_ERROR;
   317    317     }
   318    318   
   319    319     Tcl_CreateObjCommand(
   320    320         interp, Tcl_GetString(objv[1]), superunlock_cmd, pLock, superunlock_del