More FlexeLint v9 consts

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3364 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_expire.c b/varnish-cache/bin/varnishd/cache_expire.c
index feddd5d8b0be21baa4f374dca66999228200ddd8..2e92329e8652680b3618ef0e836e565f3bc545e6 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_expire.c
+++ b/varnish-cache/bin/varnishd/cache_expire.c
@@ -69,8 +69,8 @@
  * housekeeping fields parts of an object.
  */
 
-static const char *tmr_prefetch        = "prefetch";
-static const char *tmr_ttl     = "ttl";
+static const char * const tmr_prefetch = "prefetch";
+static const char * const tmr_ttl      = "ttl";
 
 struct objexp {
        unsigned                magic;

diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 2469378f30cbc7aa80296f5bebd2ae64885c3aeb..847c2fa5b8a5d2480e6d3b17aa1ce5529d18bc00 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -81,7 +81,7 @@ static enum {
        CH_DIED = 4
 }                      child_state = CH_STOPPED;
 
-static const char *ch_state[] = {
+static const char * const ch_state[] = {
        [CH_STOPPED] =  "stopped",
        [CH_STARTING] = "starting",
        [CH_RUNNING] =  "running",

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index fdce14fb3d396c05d8fbbd920aedd5bb5d8161b2..5759666dda80c9b8b2a7f1a59bc422c00c70f67b 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -117,7 +117,7 @@ extern struct stevedore smf_stevedore;
 extern struct stevedore smu_stevedore;
 #endif
 
-static struct choice stv_choice[] = {
+static const struct choice stv_choice[] = {
        { "file",       &smf_stevedore },
        { "malloc",     &sma_stevedore },
 #ifdef HAVE_LIBUMEM
@@ -158,7 +158,7 @@ setup_storage(const char *spec)
 extern struct hash_slinger hsl_slinger;
 extern struct hash_slinger hcl_slinger;
 
-static struct choice hsh_choice[] = {
+static const struct choice hsh_choice[] = {
        { "classic",            &hcl_slinger },
        { "simple",             &hsl_slinger },
        { "simple_list",        &hsl_slinger }, /* backwards compat */

diff --git a/varnish-cache/lib/libvarnish/crc32.c b/varnish-cache/lib/libvarnish/crc32.c
index 883439d6338b883ef0d3ba6c8f9f4b99f8105926..a1e1a58fe70c07fed663da715cf733b6622f85cd 100644 (file)
--- a/varnish-cache/lib/libvarnish/crc32.c
+++ b/varnish-cache/lib/libvarnish/crc32.c
@@ -37,7 +37,7 @@
 
 /*--------------------------------------------------------------------*/
 
-static uint32_t crc32bits[] = {
+static const uint32_t crc32bits[] = {
     0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
     0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
     0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,

diff --git a/varnish-cache/lib/libvcl/vcc_fixed_token.c b/varnish-cache/lib/libvcl/vcc_fixed_token.c
index e796d837261ec39e54b99abccece3217a2dc1a8a..07000c23e81235a01911d68c5426889c47996a0d 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_fixed_token.c
+++ b/varnish-cache/lib/libvcl/vcc_fixed_token.c
@@ -104,7 +104,7 @@ vcl_fixed_token(const char *p, const char **q)
        }
 }
 
-const char *vcl_tnames[256] = {
+const char * const vcl_tnames[256] = {
        ['!'] = "'!'",
        ['%'] = "'%'",
        ['&'] = "'&'",

diff --git a/varnish-cache/lib/libvcl/vcc_priv.h b/varnish-cache/lib/libvcl/vcc_priv.h
index 52ce2323060e986043156e32bc79f8ed2c6831a7..27d20e09616978d0d9e1f324a0cacc731f48f5f4 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_priv.h
+++ b/varnish-cache/lib/libvcl/vcc_priv.h
@@ -39,7 +39,7 @@ struct vsb;
 #define isident(c) (isalpha(c) || isdigit(c) || (c) == '_' || (c) == '-')
 #define isvar(c) (isident(c) || (c) == '.')
 unsigned vcl_fixed_token(const char *p, const char **q);
-extern const char *vcl_tnames[256];
+extern const char * const vcl_tnames[256];
 void vcl_output_lang_h(struct vsb *sb);
 
 #define PF(t)  (int)((t)->e - (t)->b), (t)->b