SQLite: Check-in [b33f1bacfd]

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

Overview

Comment:	Fix typo in Win32 VFS code enabled when the SQLITE_WIN32_USE_UUID compile-time option is used.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	b33f1bacfdb34fe66b7b073e68bfac38498d6e88
User & Date:	mistachkin 2015-05-12 19:53:15

Context

2015-05-13
04:50		Enhancements to the MSVC makefile. (check-in: 59e3e9e764 user: mistachkin tags: trunk)
2015-05-12
19:53		Fix typo in Win32 VFS code enabled when the SQLITE_WIN32_USE_UUID compile-time option is used. (check-in: b33f1bacfd user: mistachkin tags: trunk)
19:10		Attempt to get DBSTAT to compile without warnings across all build configurations. (check-in: c3cbe3b06e user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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