/ Check-in [10ee36d0]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge updates from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | get-trace
Files: files | file ages | folders
SHA1: 10ee36d012e6ee82febbe0ef2e90381e215afb90
User & Date: mistachkin 2015-05-13 04:52:26
Context
2015-05-13
04:52
Merge updates from trunk. Leaf check-in: 10ee36d0 user: mistachkin tags: get-trace
04:50
Enhancements to the MSVC makefile. check-in: 59e3e9e7 user: mistachkin tags: trunk
2015-05-12
23:33
Use the database mutex where applicable. check-in: 28cfdabc user: mistachkin tags: get-trace
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to Makefile.msc.

    31     31   
    32     32   # Set this non-0 to have the shell executable link against the core dynamic
    33     33   # link library.
    34     34   #
    35     35   !IFNDEF DYNAMIC_SHELL
    36     36   DYNAMIC_SHELL = 0
    37     37   !ENDIF
           38  +
           39  +# Set this non-0 to enable extra code that attempts to detect misuse of the
           40  +# SQLite API.
           41  +#
           42  +!IFNDEF API_ARMOR
           43  +API_ARMOR = 0
           44  +!ENDIF
    38     45   
    39     46   # If necessary, create a list of harmless compiler warnings to disable when
    40     47   # compiling the various tools.  For the SQLite source code itself, warnings,
    41     48   # if any, will be disabled from within it.
    42     49   #
    43     50   !IFNDEF NO_WARN
    44     51   !IF $(USE_FULLWARN)!=0
................................................................................
   487    494   #
   488    495   !IF $(DEBUG)==0
   489    496   TCC = $(TCC) -DNDEBUG
   490    497   BCC = $(BCC) -DNDEBUG
   491    498   RCC = $(RCC) -DNDEBUG
   492    499   !ENDIF
   493    500   
   494         -!IF $(DEBUG)>0
   495         -TCC = $(TCC) -DSQLITE_ENABLE_API_ARMOR
   496         -RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR
          501  +!IF $(DEBUG)>0 || $(API_ARMOR)!=0
          502  +TCC = $(TCC) -DSQLITE_ENABLE_API_ARMOR=1
          503  +RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
   497    504   !ENDIF
   498    505   
   499    506   !IF $(DEBUG)>2
   500         -TCC = $(TCC) -DSQLITE_DEBUG
   501         -RCC = $(RCC) -DSQLITE_DEBUG
          507  +TCC = $(TCC) -DSQLITE_DEBUG=1
          508  +RCC = $(RCC) -DSQLITE_DEBUG=1
   502    509   !ENDIF
   503    510   
   504    511   !IF $(DEBUG)>4 || $(OSTRACE)!=0
   505    512   TCC = $(TCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
   506    513   RCC = $(RCC) -DSQLITE_FORCE_OS_TRACE=1 -DSQLITE_DEBUG_OS_TRACE=1
   507    514   !ENDIF
   508    515   
   509    516   !IF $(DEBUG)>5
   510         -TCC = $(TCC) -DSQLITE_ENABLE_IOTRACE
   511         -RCC = $(RCC) -DSQLITE_ENABLE_IOTRACE
          517  +TCC = $(TCC) -DSQLITE_ENABLE_IOTRACE=1
          518  +RCC = $(RCC) -DSQLITE_ENABLE_IOTRACE=1
   512    519   !ENDIF
   513    520   
   514    521   # Prevent warnings about "insecure" MSVC runtime library functions
   515    522   # being used.
   516    523   #
   517    524   TCC = $(TCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS
   518    525   BCC = $(BCC) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS

Changes to src/os_win.c.

  5407   5407       n += sizeof(i);
  5408   5408     }
  5409   5409   #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && SQLITE_WIN32_USE_UUID
  5410   5410     if( sizeof(UUID)<=nBuf-n ){
  5411   5411       UUID id;
  5412   5412       memset(&id, 0, sizeof(UUID));
  5413   5413       osUuidCreate(&id);
  5414         -    memcpy(zBuf, &id, sizeof(UUID));
         5414  +    memcpy(&zBuf[n], &id, sizeof(UUID));
  5415   5415       n += sizeof(UUID);
  5416   5416     }
  5417   5417     if( sizeof(UUID)<=nBuf-n ){
  5418   5418       UUID id;
  5419   5419       memset(&id, 0, sizeof(UUID));
  5420   5420       osUuidCreateSequential(&id);
  5421         -    memcpy(zBuf, &id, sizeof(UUID));
         5421  +    memcpy(&zBuf[n], &id, sizeof(UUID));
  5422   5422       n += sizeof(UUID);
  5423   5423     }
  5424   5424   #endif
  5425   5425   #endif /* defined(SQLITE_TEST) || defined(SQLITE_ZERO_PRNG_SEED) */
  5426   5426     return n;
  5427   5427   }
  5428   5428