From: drh <drh@noemail.net>
Date: Fri, 13 Sep 2013 21:03:45 +0000 (+0000)
Subject: Fix the "const" qualifiers on the pragma name table.
X-Git-Tag: version-3.8.1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77ff23f9c71b7b0ac9de8aa4e5c9ddd6c9d69e7c;p=thirdparty%2Fsqlite.git

Fix the "const" qualifiers on the pragma name table.

FossilOrigin-Name: b74e6be818fa7d19f1af6d86ad1d2ecba334b01b
---

diff --git a/manifest b/manifest
index bb34ccc2e5..63bfd76595 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssoft_heap_limit\spragma.
-D 2013-09-13T21:01:56.467
+C Fix\sthe\s"const"\squalifiers\son\sthe\spragma\sname\stable.
+D 2013-09-13T21:03:46.000
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -210,7 +210,7 @@ F src/parse.y a97566d6da75075589a7c716d1bda14b586cf8da
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
-F src/pragma.c d3d93be2c810b7bba9b10022b82bf1a4ecce4750
+F src/pragma.c 0c7a67a75cb4f9849190f33f62534d37f38ff8ed
 F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
 F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
 F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
@@ -1081,7 +1081,7 @@ F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
 F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
-F tool/mkpragmatab.tcl 8f50568b7f994c3db08267009927bc9e0f684204
+F tool/mkpragmatab.tcl e24da1496b4af6de448e9673cf6adbef53e6e830
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 F tool/mksqlite3c.tcl d344cc3144a0271cd853c5e3df36e9f31d78d619
@@ -1114,7 +1114,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P c82e05c4b8e000684d95ac8417afaef5e4d633e6
-R ba1e9bfd4329e5207aeb95ad15bc0bc6
+P c326356f9a18bff5cf36bd59331e2cc207e349fa
+R 6d68ea4b4eed042d0b1e391d74292a44
 U drh
-Z 6017bc3f72f825d3266b1ab91e26a42a
+Z 7d8db2c2ae40e3aff65c381f48f9b82a
diff --git a/manifest.uuid b/manifest.uuid
index 6280f4130e..9ec1c5a1ee 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c326356f9a18bff5cf36bd59331e2cc207e349fa
\ No newline at end of file
+b74e6be818fa7d19f1af6d86ad1d2ecba334b01b
\ No newline at end of file
diff --git a/src/pragma.c b/src/pragma.c
index a53c891186..a79b401f03 100644
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -69,7 +69,7 @@
 #define PragTyp_LOCK_STATUS                   38
 #define PragTyp_PARSER_TRACE                  39
 static const struct sPragmaNames {
-  const char const *zName;  /* Name of pragma */
+  const char *const zName;  /* Name of pragma */
   u8 ePragTyp;              /* PragTyp_XXX value */
   u32 iArg;                 /* Extra argument */
 } aPragmaNames[] = {
diff --git a/tool/mkpragmatab.tcl b/tool/mkpragmatab.tcl
index 262703f663..fd4490c4bc 100644
--- a/tool/mkpragmatab.tcl
+++ b/tool/mkpragmatab.tcl
@@ -311,7 +311,7 @@ foreach name $allnames {
 # Generate the lookup table
 #
 puts "static const struct sPragmaNames \173"
-puts "  const char const *zName;  /* Name of pragma */"
+puts "  const char *const zName;  /* Name of pragma */"
 puts "  u8 ePragTyp;              /* PragTyp_XXX value */"
 puts "  u32 iArg;                 /* Extra argument */"
 puts "\175 aPragmaNames\[\] = \173"