Fossil SCM
Merge updates from trunk.
Commit
5447bc90282ca2b0e93f51bb5b04be23031b5c61b2a7ab4cb88842bc4c3fe4b7
Parent
a6a2d861d12333e…
4 files changed
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -920,11 +920,11 @@ | ||
| 920 | 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | 921 | int rc; |
| 922 | 922 | const char *zRc; |
| 923 | 923 | #endif |
| 924 | 924 | Stmt q; |
| 925 | - size_t pageSize; | |
| 925 | + size_t pageSize = 0; | |
| 926 | 926 | blob_zero(pOut); |
| 927 | 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | 928 | if( !bVerbose ) return; |
| 929 | 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 | 931 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -920,11 +920,11 @@ | |
| 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | int rc; |
| 922 | const char *zRc; |
| 923 | #endif |
| 924 | Stmt q; |
| 925 | size_t pageSize; |
| 926 | blob_zero(pOut); |
| 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | if( !bVerbose ) return; |
| 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -920,11 +920,11 @@ | |
| 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | int rc; |
| 922 | const char *zRc; |
| 923 | #endif |
| 924 | Stmt q; |
| 925 | size_t pageSize = 0; |
| 926 | blob_zero(pOut); |
| 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | if( !bVerbose ) return; |
| 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -920,11 +920,11 @@ | ||
| 920 | 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | 921 | int rc; |
| 922 | 922 | const char *zRc; |
| 923 | 923 | #endif |
| 924 | 924 | Stmt q; |
| 925 | - size_t pageSize; | |
| 925 | + size_t pageSize = 0; | |
| 926 | 926 | blob_zero(pOut); |
| 927 | 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | 928 | if( !bVerbose ) return; |
| 929 | 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 | 931 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -920,11 +920,11 @@ | |
| 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | int rc; |
| 922 | const char *zRc; |
| 923 | #endif |
| 924 | Stmt q; |
| 925 | size_t pageSize; |
| 926 | blob_zero(pOut); |
| 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | if( !bVerbose ) return; |
| 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -920,11 +920,11 @@ | |
| 920 | #if defined(FOSSIL_ENABLE_TCL) |
| 921 | int rc; |
| 922 | const char *zRc; |
| 923 | #endif |
| 924 | Stmt q; |
| 925 | size_t pageSize = 0; |
| 926 | blob_zero(pOut); |
| 927 | blob_appendf(pOut, "This is fossil version %s\n", get_version()); |
| 928 | if( !bVerbose ) return; |
| 929 | blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n", |
| 930 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 931 |
+1
-1
| --- src/util.c | ||
| +++ src/util.c | ||
| @@ -84,11 +84,11 @@ | ||
| 84 | 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | 85 | #endif |
| 86 | 86 | } |
| 87 | 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | 88 | void *p; |
| 89 | - size_t pageSize; | |
| 89 | + size_t pageSize = 0; | |
| 90 | 90 | |
| 91 | 91 | fossil_get_page_size(&pageSize); |
| 92 | 92 | assert( pageSize>0 ); |
| 93 | 93 | assert( pageSize%2==0 ); |
| 94 | 94 | #if defined(_WIN32) |
| 95 | 95 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | #endif |
| 86 | } |
| 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | void *p; |
| 89 | size_t pageSize; |
| 90 | |
| 91 | fossil_get_page_size(&pageSize); |
| 92 | assert( pageSize>0 ); |
| 93 | assert( pageSize%2==0 ); |
| 94 | #if defined(_WIN32) |
| 95 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | #endif |
| 86 | } |
| 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | void *p; |
| 89 | size_t pageSize = 0; |
| 90 | |
| 91 | fossil_get_page_size(&pageSize); |
| 92 | assert( pageSize>0 ); |
| 93 | assert( pageSize%2==0 ); |
| 94 | #if defined(_WIN32) |
| 95 |
+1
-1
| --- src/util.c | ||
| +++ src/util.c | ||
| @@ -84,11 +84,11 @@ | ||
| 84 | 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | 85 | #endif |
| 86 | 86 | } |
| 87 | 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | 88 | void *p; |
| 89 | - size_t pageSize; | |
| 89 | + size_t pageSize = 0; | |
| 90 | 90 | |
| 91 | 91 | fossil_get_page_size(&pageSize); |
| 92 | 92 | assert( pageSize>0 ); |
| 93 | 93 | assert( pageSize%2==0 ); |
| 94 | 94 | #if defined(_WIN32) |
| 95 | 95 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | #endif |
| 86 | } |
| 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | void *p; |
| 89 | size_t pageSize; |
| 90 | |
| 91 | fossil_get_page_size(&pageSize); |
| 92 | assert( pageSize>0 ); |
| 93 | assert( pageSize%2==0 ); |
| 94 | #if defined(_WIN32) |
| 95 |
| --- src/util.c | |
| +++ src/util.c | |
| @@ -84,11 +84,11 @@ | |
| 84 | *piPageSize = 4096; /* FIXME: What for POSIX? */ |
| 85 | #endif |
| 86 | } |
| 87 | void *fossil_secure_alloc_page(size_t *pN){ |
| 88 | void *p; |
| 89 | size_t pageSize = 0; |
| 90 | |
| 91 | fossil_get_page_size(&pageSize); |
| 92 | assert( pageSize>0 ); |
| 93 | assert( pageSize%2==0 ); |
| 94 | #if defined(_WIN32) |
| 95 |