Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix MSVC compiler warning in vdbeaux.c. (CVS 6485) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
d619465e31c2366b389fea6ee2ce6b18 |
| User & Date: | shane 2009-04-10 15:42:36 |
Context
|
2009-04-10
| ||
| 18:21 | Re-enable the alt_pcache tests in permutations.test so that they run automatically during a full regression. Fix async.test so that it works with the permutation.test pcacheNN test modules. (CVS 6486) (check-in: 310192cc user: drh tags: trunk) | |
| 15:42 | Fix MSVC compiler warning in vdbeaux.c. (CVS 6485) (check-in: d619465e user: shane tags: trunk) | |
| 15:38 | Disable the select1-15 tests when locking_mode is EXCLUSIVE. Ticket #3771. (CVS 6484) (check-in: 88cefbb4 user: drh tags: trunk) | |
Changes
Changes to src/vdbeaux.c.
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
....
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
|
** ************************************************************************* ** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. ** ** $Id: vdbeaux.c,v 1.450 2009/04/10 12:55:17 danielk1977 Exp $ */ #include "sqliteInt.h" #include "vdbeInt.h" /* ................................................................................ int d; u32 idx; u16 u; /* Unsigned loop counter */ u32 szHdr; Mem *pMem; int nOff; /* Increase pSpace by this much to 8-byte align it */ nOff = (8 - ((pSpace - (char*)0)&7)) & 7; pSpace += nOff; szSpace -= nOff; nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1); if( nByte>szSpace ){ p = sqlite3DbMallocRaw(pKeyInfo->db, nByte); if( p==0 ) return 0; p->flags = UNPACKED_NEED_FREE | UNPACKED_NEED_DESTROY; |
|
<
>
>
>
>
>
>
|
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
....
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
|
** ************************************************************************* ** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite3_stmt" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. ** ** $Id: vdbeaux.c,v 1.451 2009/04/10 15:42:36 shane Exp $ */ #include "sqliteInt.h" #include "vdbeInt.h" /* ................................................................................ int d; u32 idx; u16 u; /* Unsigned loop counter */ u32 szHdr; Mem *pMem; int nOff; /* Increase pSpace by this much to 8-byte align it */ /* ** We want to shift the pointer pSpace up such that it is 8-byte aligned. ** Thus, we need to calculate a value, nOff, between 0 and 7, to shift ** it by. If pSpace is already 8-byte aligned, nOff should be zero. */ nOff = (8 - (SQLITE_PTR_TO_INT(pSpace) & 7)) & 7; pSpace += nOff; szSpace -= nOff; nByte = ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*(pKeyInfo->nField+1); if( nByte>szSpace ){ p = sqlite3DbMallocRaw(pKeyInfo->db, nByte); if( p==0 ) return 0; p->flags = UNPACKED_NEED_FREE | UNPACKED_NEED_DESTROY; |