Use const char* for safety

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

diff --git a/varnish-cache/include/vrt_obj.h b/varnish-cache/include/vrt_obj.h
index ea83bcf6bdca49c283165e542c11c950c1ba9628..ad9fb96702e78b176ccb7311210914a22cc40cdf 100644 (file)
--- a/varnish-cache/include/vrt_obj.h
+++ b/varnish-cache/include/vrt_obj.h
@@ -1,19 +1,19 @@
 /*
- * $Id$
+ * $Id: vcc_gen_obj.tcl 545 2006-07-21 20:43:56Z phk $
  *
  * NB:  This file is machine generated, DO NOT EDIT!
  *
  * Edit vcc_gen_obj.tcl instead
  */
 
-char * VRT_r_backend_host(struct backend *);
-void VRT_l_backend_host(struct backend *, char *);
-char * VRT_r_backend_port(struct backend *);
-void VRT_l_backend_port(struct backend *, char *);
-char * VRT_r_req_request(struct sess *);
-void VRT_l_req_request(struct sess *, char *);
-char * VRT_r_req_url(struct sess *);
-void VRT_l_req_url(struct sess *, char *);
+const char * VRT_r_backend_host(struct backend *);
+void VRT_l_backend_host(struct backend *, const char *);
+const char * VRT_r_backend_port(struct backend *);
+void VRT_l_backend_port(struct backend *, const char *);
+const char * VRT_r_req_request(struct sess *);
+void VRT_l_req_request(struct sess *, const char *);
+const char * VRT_r_req_url(struct sess *);
+void VRT_l_req_url(struct sess *, const char *);
 double VRT_r_obj_valid(struct sess *);
 void VRT_l_obj_valid(struct sess *, double);
 double VRT_r_obj_cacheable(struct sess *);
@@ -22,5 +22,5 @@ struct backend * VRT_r_obj_backend(struct sess *);
 void VRT_l_obj_backend(struct sess *, struct backend *);
 double VRT_r_obj_ttl(struct sess *);
 void VRT_l_obj_ttl(struct sess *, double);
-char * VRT_r_req_http_(struct sess *);
-void VRT_l_req_http_(struct sess *, char *);
+const char * VRT_r_req_http_(struct sess *);
+void VRT_l_req_http_(struct sess *, const char *);

diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index 3a058013544b2f70e0f7e9b26b7d22771b71e998..41ad625117c0f8391381719c2b884f93bba2ef73 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -21,13 +21,13 @@ set spobj {
         { req.http.    HEADER }
 }
 
-set tt(STRING) "char *"
+set tt(STRING) "const char *"
 set tt(BOOL)   "double"
 set tt(BACKEND)        "struct backend *"
 set tt(TIME)   "double"
-set tt(HEADER) "char *"
-set tt(HOSTNAME) "char *"
-set tt(PORTNAME) "char *"
+set tt(HEADER) "const char *"
+set tt(HOSTNAME) "const char *"
+set tt(PORTNAME) "const char *"
 
 #----------------------------------------------------------------------
 # Boilerplate warning for all generated files.

diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c
index 6d4c33cb846002a79fc2816f0b34bff1ad4e5d15..7ae798544b800b356e10644e1f277258712fdf20 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_obj.c
+++ b/varnish-cache/lib/libvcl/vcc_obj.c
@@ -62,14 +62,14 @@ const char *vrt_obj_h =
        " * Edit vcc_gen_obj.tcl instead\n"
        " */\n"
        "\n"
-       "char * VRT_r_backend_host(struct backend *);\n"
-       "void VRT_l_backend_host(struct backend *, char *);\n"
-       "char * VRT_r_backend_port(struct backend *);\n"
-       "void VRT_l_backend_port(struct backend *, char *);\n"
-       "char * VRT_r_req_request(struct sess *);\n"
-       "void VRT_l_req_request(struct sess *, char *);\n"
-       "char * VRT_r_req_url(struct sess *);\n"
-       "void VRT_l_req_url(struct sess *, char *);\n"
+       "const char * VRT_r_backend_host(struct backend *);\n"
+       "void VRT_l_backend_host(struct backend *, const char *);\n"
+       "const char * VRT_r_backend_port(struct backend *);\n"
+       "void VRT_l_backend_port(struct backend *, const char *);\n"
+       "const char * VRT_r_req_request(struct sess *);\n"
+       "void VRT_l_req_request(struct sess *, const char *);\n"
+       "const char * VRT_r_req_url(struct sess *);\n"
+       "void VRT_l_req_url(struct sess *, const char *);\n"
        "double VRT_r_obj_valid(struct sess *);\n"
        "void VRT_l_obj_valid(struct sess *, double);\n"
        "double VRT_r_obj_cacheable(struct sess *);\n"
@@ -78,6 +78,6 @@ const char *vrt_obj_h =
        "void VRT_l_obj_backend(struct sess *, struct backend *);\n"
        "double VRT_r_obj_ttl(struct sess *);\n"
        "void VRT_l_obj_ttl(struct sess *, double);\n"
-       "char * VRT_r_req_http_(struct sess *);\n"
-       "void VRT_l_req_http_(struct sess *, char *);\n"
+       "const char * VRT_r_req_http_(struct sess *);\n"
+       "void VRT_l_req_http_(struct sess *, const char *);\n"
 ;