Add a 'const' to the opcodeProperty array in vdbe.c. (CVS 5661)

FossilOrigin-Name: 29c9a80294398a349bc7cf0fb84cd4ef8a9e2f60

diff --git a/manifest b/manifest
index 309f35d8eba55162f83a536696bfe4c160b0d547..7e781ed99bb3cd68d70d79c9a61e1268bbc2ddf5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\ssome\smore\sglobal\svariables\sto\swork\swith\sOMIT_WSD.\s(CVS\s5660)
-D 2008-09-02T10:22:01
+C Add\sa\s'const'\sto\sthe\sopcodeProperty\sarray\sin\svdbe.c.\s(CVS\s5661)
+D 2008-09-02T11:05:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 689e14735f862a5553bceef206d8c13e29504e44
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
 F src/os_unix.c 4665cef7639dd937893c3ea076f0e8a8f215bb32
 F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540
-F src/pager.c 032d11049af4ec49bdbaa3584e7ce9887098b66a
+F src/pager.c 24a494282792f3a08d972a39c27e3a6a24ab18d3
 F src/pager.h c45380ca9d0933ea5bc4ecb3a43958b6d2ec5a9c
 F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8
 F src/pcache.c ff79cb5eb797d0f1a244b4332c2d39cb5cfd066b
@@ -187,7 +187,7 @@ F src/update.c 206fffc877379affe3a9b42c78e478ea0874c9fe
 F src/utf.c c63e6f69082f85c19ab88d62dedaf91d71ac1a50
 F src/util.c afe659ccc05d1f8af9e8631dabfec3ee3a7144af
 F src/vacuum.c fd77433d0c26d3ff1eb96eab017a1787ac5aa642
-F src/vdbe.c adcc179a31d71466b7b4f20ab77555e1e137bfe5
+F src/vdbe.c ebc6f6bc8663ca00b6c7ed41bc464023dd6e0483
 F src/vdbe.h 41c99aaad9167c1b5431993db446de74b2f71fc3
 F src/vdbeInt.h b48c74d86a9fb62b707a3186ccca76bb32f1c6be
 F src/vdbeapi.c 3c98fbed9d4e10a4fbe09fce47e88ec567927a7b
@@ -630,7 +630,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 44def90d1bd4e37ab162e16f83e23d32e86b78ab
-R 7402c8bee4c430248c86583164bf1a09
+P 46acaf58e11ebe69e4fb5f171d3ee29f056d8e68
+R 509902146f627322a8ff8638644cae64
 U danielk1977
-Z af41b1479a16ee61f52f69a5df4f2ee5
+Z 9cbec7a0d066203372160256f057c075

diff --git a/manifest.uuid b/manifest.uuid
index a72cd753d336a881601492b2dc798d9b52f5f44b..0284c79433d53ffad51e0410beb7569d61857d66 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46acaf58e11ebe69e4fb5f171d3ee29f056d8e68
\ No newline at end of file
+29c9a80294398a349bc7cf0fb84cd4ef8a9e2f60
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 9b063b7b2c5f3c814030477cdf1e7148df6ffcb1..403a9ee528c0581c57580e6f80e60e2a1f61d3f2 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.485 2008/08/28 02:26:07 drh Exp $
+** @(#) $Id: pager.c,v 1.486 2008/09/02 11:05:02 danielk1977 Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -578,7 +578,7 @@ static void seekJournalHdr(Pager *pPager){
 */
 static int zeroJournalHdr(Pager *pPager, int doTruncate){
   int rc = SQLITE_OK;
-  static const char zeroHdr[28];
+  static const char zeroHdr[28] = {};
 
   if( pPager->journalOff ){
     i64 iLimit = pPager->journalSizeLimit;

diff --git a/src/vdbe.c b/src/vdbe.c
index dca420af17bc05af6cb197cd43557c67ea810c54..28b6a9e20072e355d0f9a08391fb76dd6086b20b 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.777 2008/08/21 19:28:30 drh Exp $
+** $Id: vdbe.c,v 1.778 2008/09/02 11:05:02 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -176,7 +176,7 @@ static void _storeTypeInfo(Mem *pMem){
 ** from the comments following the "case OP_xxxx:" statements in
 ** this file.  
 */
-static unsigned char opcodeProperty[] = OPFLG_INITIALIZER;
+static const unsigned char opcodeProperty[] = OPFLG_INITIALIZER;
 
 /*
 ** Return true if an opcode has any of the OPFLG_xxx properties