/ Check-in [ac336959]
Login

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

Overview
Comment:Fix an outdated comment and a comment typo. No changes to code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ac336959490083ffeaaf25aaec97ecb59a2f4536
User & Date: mistachkin 2013-08-13 22:33:41
Context
2013-08-14
00:20
Fix a few more minor comment typos. No changes to code. check-in: 9e999081 user: mistachkin tags: trunk
2013-08-13
22:33
Fix an outdated comment and a comment typo. No changes to code. check-in: ac336959 user: mistachkin tags: trunk
2013-08-08
14:38
If the SQLITE_EXTRA_INIT function is defined, make sure it is called only once by the effective sqlite3_initialize() call. check-in: e2b597ca user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

   444    444           ** back to NULL pointers too.  This will cause the malloc to go
   445    445           ** back to its default implementation when sqlite3_initialize() is
   446    446           ** run.
   447    447           */
   448    448           memset(&sqlite3GlobalConfig.m, 0, sizeof(sqlite3GlobalConfig.m));
   449    449         }else{
   450    450           /* The heap pointer is not NULL, then install one of the
   451         -        ** mem5.c/mem3.c methods. If neither ENABLE_MEMSYS3 nor
   452         -        ** ENABLE_MEMSYS5 is defined, return an error.
          451  +        ** mem5.c/mem3.c methods.  The enclosing #if guarantees at
          452  +        ** least one of these methods is currently enabled.
   453    453           */
   454    454   #ifdef SQLITE_ENABLE_MEMSYS3
   455    455           sqlite3GlobalConfig.m = *sqlite3MemGetMemsys3();
   456    456   #endif
   457    457   #ifdef SQLITE_ENABLE_MEMSYS5
   458    458           sqlite3GlobalConfig.m = *sqlite3MemGetMemsys5();
   459    459   #endif
................................................................................
   464    464   
   465    465       case SQLITE_CONFIG_LOOKASIDE: {
   466    466         sqlite3GlobalConfig.szLookaside = va_arg(ap, int);
   467    467         sqlite3GlobalConfig.nLookaside = va_arg(ap, int);
   468    468         break;
   469    469       }
   470    470       
   471         -    /* Record a pointer to the logger funcction and its first argument.
          471  +    /* Record a pointer to the logger function and its first argument.
   472    472       ** The default is NULL.  Logging is disabled if the function pointer is
   473    473       ** NULL.
   474    474       */
   475    475       case SQLITE_CONFIG_LOG: {
   476    476         /* MSVC is picky about pulling func ptrs from va lists.
   477    477         ** http://support.microsoft.com/kb/47961
   478    478         ** sqlite3GlobalConfig.xLog = va_arg(ap, void(*)(void*,int,const char*));