r4235 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Fri Sep 11 15:06:16 CEST 2009
Author: phk
Date: 2009-09-11 15:06:15 +0200 (Fri, 11 Sep 2009)
New Revision: 4235
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishd/cache_expire.c
trunk/varnish-cache/bin/varnishd/cache_fetch.c
trunk/varnish-cache/bin/varnishd/cache_hash.c
trunk/varnish-cache/bin/varnishd/cache_http.c
trunk/varnish-cache/bin/varnishd/cache_pool.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/flint.lnt
trunk/varnish-cache/bin/varnishd/flint.sh
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_param.c
trunk/varnish-cache/bin/varnishd/shmlog.c
trunk/varnish-cache/bin/varnishd/stevedore.c
trunk/varnish-cache/bin/varnishd/storage_file.c
trunk/varnish-cache/bin/varnishd/storage_persistent.c
trunk/varnish-cache/include/vrt.h
trunk/varnish-cache/include/vsb.h
trunk/varnish-cache/lib/libvarnish/cli.c
trunk/varnish-cache/lib/libvarnish/cli_common.c
trunk/varnish-cache/lib/libvarnish/vev.c
trunk/varnish-cache/lib/libvarnish/vlu.c
trunk/varnish-cache/lib/libvcl/vcc_acl.c
trunk/varnish-cache/lib/libvcl/vcc_backend.c
trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
trunk/varnish-cache/lib/libvcl/vcc_obj.c
Log:
Various FlexeLint silencing
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2009-09-11 13:06:15 UTC (rev 4235)
@@ -503,7 +503,7 @@
void EXP_Init(void);
void EXP_Rearm(const struct object *o);
int EXP_Touch(const struct object *o);
-int EXP_NukeOne(struct sess *sp, const struct lru *lru);
+int EXP_NukeOne(const struct sess *sp, const struct lru *lru);
/* cache_fetch.c */
int FetchHdr(struct sess *sp);
@@ -513,7 +513,7 @@
/* cache_http.c */
const char *http_StatusMessage(unsigned);
-unsigned http_EstimateWS(struct http *fm, unsigned how);
+unsigned http_EstimateWS(const struct http *fm, unsigned how);
void HTTP_Init(void);
void http_ClrHeader(struct http *to);
unsigned http_Write(struct worker *w, const struct http *hp, int resp);
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -222,7 +222,7 @@
l = strlen(a1);
assert(l < 127);
- bt->src = malloc(l + 3);
+ bt->src = malloc(l + 3L);
XXXAN(bt->src);
bt->src[0] = (char)l + 1;
memcpy(bt->src + 1, a1, l);
Modified: trunk/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_expire.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -319,7 +319,7 @@
*/
int
-EXP_NukeOne(struct sess *sp, const struct lru *lru)
+EXP_NukeOne(const struct sess *sp, const struct lru *lru)
{
struct objcore *oc;
Modified: trunk/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_fetch.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_fetch.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -247,7 +247,7 @@
if (v == 0) {
if (st != NULL && fetchfrag > 0)
dump_st(sp, st);
- st = STV_alloc(sp, params->fetch_chunksize * 1024);
+ st = STV_alloc(sp, params->fetch_chunksize * 1024LL);
VTAILQ_INSERT_TAIL(&sp->obj->store, st, list);
p = st->ptr + st->len;
v = st->space - st->len;
Modified: trunk/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_hash.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -211,7 +211,7 @@
sp->lhashptr = 1; /* space for NUL */
sp->ihashptr = 0;
sp->nhashptr = nhashcount * 2;
- p = WS_Alloc(sp->http->ws, sizeof(const char *) * (sp->nhashptr + 1));
+ p = WS_Alloc(sp->http->ws, sizeof(const char *) * (sp->nhashptr + 1L));
XXXAN(p);
/* Align pointer properly (?) */
u = (uintptr_t)p;
Modified: trunk/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_http.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_http.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -630,7 +630,7 @@
*/
unsigned
-http_EstimateWS(struct http *fm, unsigned how)
+http_EstimateWS(const struct http *fm, unsigned how)
{
unsigned u, l;
@@ -723,7 +723,7 @@
p = WS_Alloc(hp->ws, l + 1);
if (p != NULL) {
WSLH(w, fd, hp, u);
- memcpy(p, hp->hd[u].b, l + 1);
+ memcpy(p, hp->hd[u].b, l + 1L);
hp->hd[u].b = p;
hp->hd[u].e = p + l;
} else {
@@ -781,7 +781,7 @@
to->hd[field].e = NULL;
to->hdf[field] = 0;
} else {
- memcpy(p, string, l + 1);
+ memcpy(p, string, l + 1L);
to->hd[field].b = p;
to->hd[field].e = p + l;
to->hdf[field] = 0;
Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -327,7 +327,7 @@
owq = wq;
wq = pwq;
for (u = nwq; u < pools; u++) {
- wq[u] = calloc(sizeof *wq[u], 1);
+ wq[u] = calloc(sizeof *wq[0], 1);
XXXAN(wq[u]);
wq[u]->magic = WQ_MAGIC;
Lck_New(&wq[u]->mtx);
Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -975,7 +975,7 @@
/*--------------------------------------------------------------------*/
void
-VRT_purge_string(struct sess *sp, char *str, ...)
+VRT_purge_string(struct sess *sp, const char *str, ...)
{
char *p, *a1, *a2, *a3;
char **av;
Modified: trunk/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.lnt 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/flint.lnt 2009-09-11 13:06:15 UTC (rev 4235)
@@ -1,6 +1,13 @@
-d__flexelint_v9__=1
+// FLINT Bug20090910_838
+-efunc(838, VRT_purge)
+-efunc(838, VRT_purge_string)
+
+// FLINT Bug Bug20090908_766
+-efile(766, cache_vcl.c)
+
//-sem (pthread_mutex_lock, thread_lock)
-sem (pthread_mutex_trylock, thread_lock)
-sem (VBE_DropRefLocked, thread_unlock)
@@ -42,6 +49,7 @@
-esym(458, heritage)
-esym(458, name_key)
-esym(528, svnid)
+
//////////////
-passes=3
@@ -142,22 +150,9 @@
// Review all below this line ///////////////////////////////////////////////
--e732 // Loss of sign (arg. no. 2) (int to unsigned
--e737 // [45] Loss of sign in promotion from int to unsigned
--e713 // Loss of precision (assignment) (unsigned long long to long long)
--e574 // Signed-unsigned mix with relational
--e712 // Loss of precision (assignment) (long long to
--e747 // Significant prototype coercion (arg. no. 2) long
--e776 // Possible truncation of addition
-
-/*
-
--e767 // Macro redef (system queue.h vs ours )
-
--e506 // Constant value boolean
--e818 // Pointer parameter '...' could be declared as pointing to const
--e774 // Boolean within 'if' always evaluates to False
--e534 // Ignoring return value of function
--e557 // unrecog format
-
-*/
+-e732 // 183 Loss of sign (___) (___ to ___)
+-e737 // 143 Loss of sign in promotion from ___ to ___
+-e713 // 42 Loss of precision (___) (___ to ___)
+-e574 // 48 Signed-unsigned mix with relational
+-e712 // 96 Loss of precision (___) (___ to ___)
+-e747 // 297 Significant prototype coercion (___) ___ to ___
Modified: trunk/varnish-cache/bin/varnishd/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.sh 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/flint.sh 2009-09-11 13:06:15 UTC (rev 4235)
@@ -1,12 +1,11 @@
#!/bin/sh
flexelint \
- -I/usr/include \
+ flint.lnt \
-I. \
-I../../include \
-I../.. \
-DVARNISH_STATE_DIR=\"foo\" \
- flint.lnt \
*.c \
../../lib/libvarnish/*.c \
../../lib/libvcl/*.c
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -346,7 +346,7 @@
{
int i;
- for (i = 0; i + 2 < sizeof cp->challenge; i++)
+ for (i = 0; i + 2L < sizeof cp->challenge; i++)
cp->challenge[i] = (random() % 26) + 'a';
cp->challenge[i++] = '\n';
cp->challenge[i] = '\0';
Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -758,7 +758,7 @@
0,
"on", "bool" },
{ "ban_lurker_sleep", tweak_timeout_double,
- &master.ban_lurker_sleep, 0.0, UINT_MAX,
+ &master.ban_lurker_sleep, 0, UINT_MAX,
"How long time does the ban lurker thread sleeps between "
"successfull attempts to push the last item up the purge "
" list. It always sleeps a second when nothing can be done.\n"
@@ -919,7 +919,7 @@
margin = strlen(pp->name) + 1;
n++;
}
- parspec = realloc(parspec, (nparspec + n + 1) * sizeof *parspec);
+ parspec = realloc(parspec, (1L + nparspec + n) * sizeof *parspec);
XXXAN(parspec);
for (pp = ps; pp->name != NULL; pp++)
parspec[nparspec++] = pp;
Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -166,7 +166,7 @@
p = logstart + loghead->ptr;
/* +1 for the NUL */
- n = vsnprintf((char *)(p + SHMLOG_DATA), mlen + 1, fmt, ap);
+ n = vsnprintf((char *)(p + SHMLOG_DATA), mlen + 1L, fmt, ap);
if (n > mlen)
n = mlen; /* we truncate long fields */
vsl_hdr(tag, p, n, id);
@@ -266,7 +266,7 @@
p = w->wlp;
/* +1 for the NUL */
- n = vsnprintf((char *)(p + SHMLOG_DATA), mlen + 1, fmt, ap);
+ n = vsnprintf((char *)(p + SHMLOG_DATA), mlen + 1L, fmt, ap);
if (n > mlen)
n = mlen; /* we truncate long fields */
vsl_hdr(tag, p, n, id);
Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -113,7 +113,7 @@
STV_NewObject(struct sess *sp, unsigned l, double ttl)
{
struct object *o;
- struct storage *st = NULL;
+ struct storage *st;
(void)ttl;
if (l == 0)
Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -412,7 +412,7 @@
if (*fail < (uintmax_t)sc->pagesize * MINPAGES)
return;
- if (sz > 0 && sz < *fail && sz < SIZE_MAX) {
+ if (sz > 0 && sz < *fail && sz < SSIZE_MAX) {
p = mmap(NULL, sz, PROT_READ|PROT_WRITE,
MAP_NOCORE | MAP_NOSYNC | MAP_SHARED, sc->fd, off);
if (p != MAP_FAILED) {
@@ -427,8 +427,8 @@
*fail = sz;
h = sz / 2;
- if (h > SIZE_MAX)
- h = SIZE_MAX;
+ if (h > SSIZE_MAX)
+ h = SSIZE_MAX;
h -= (h % sc->pagesize);
smf_open_chunk(sc, h, off, fail, sum);
Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -997,7 +997,7 @@
sc->tailban = NULL;
printf("Silo completely loaded\n");
while (1)
- sleep (1);
+ (void)sleep (1);
NEEDLESS_RETURN(NULL);
}
Modified: trunk/varnish-cache/include/vrt.h
===================================================================
--- trunk/varnish-cache/include/vrt.h 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/include/vrt.h 2009-09-11 13:06:15 UTC (rev 4235)
@@ -144,7 +144,7 @@
void VRT_panic(struct sess *sp, const char *, ...);
void VRT_purge(struct sess *sp, char *, ...);
-void VRT_purge_string(struct sess *sp, char *, ...);
+void VRT_purge_string(struct sess *sp, const char *, ...);
void VRT_count(const struct sess *, unsigned);
int VRT_rewrite(const char *, const char *);
Modified: trunk/varnish-cache/include/vsb.h
===================================================================
--- trunk/varnish-cache/include/vsb.h 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/include/vsb.h 2009-09-11 13:06:15 UTC (rev 4235)
@@ -37,8 +37,8 @@
unsigned s_magic;
char *s_buf; /* storage buffer */
void *s_unused; /* binary compatibility. */
- int s_size; /* size of storage buffer */
- int s_len; /* current length of string */
+ size_t s_size; /* size of storage buffer */
+ size_t s_len; /* current length of string */
#define VSB_FIXEDLEN 0x00000000 /* fixed length buffer (default) */
#define VSB_AUTOEXTEND 0x00000001 /* automatically extend buffer */
#define VSB_USRFLAGMSK 0x0000ffff /* mask of flags the user may specify */
Modified: trunk/varnish-cache/lib/libvarnish/cli.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvarnish/cli.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -150,7 +150,7 @@
for(c = c2; c != NULL && c->request != NULL; c++)
i2++;
- c = malloc(sizeof(*c) * (i1 + i2 + 1));
+ c = malloc(sizeof(*c) * (1L + i1 + i2));
if (c == NULL)
return (c);
if (c1 != NULL)
Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -174,7 +174,7 @@
j = sscanf(res, "%u %u\n", &u, &v);
assert(j == 2);
*status = u;
- p = malloc(v + 1);
+ p = malloc(v + 1L);
assert(p != NULL);
i = read_tmo(fd, p, v + 1, tmo);
if (i < 0) {
Modified: trunk/varnish-cache/lib/libvarnish/vev.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vev.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvarnish/vev.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -151,7 +151,7 @@
if (sig < vev_nsig)
return (0);
- os = calloc(sizeof *os, (sig + 1));
+ os = calloc(sizeof *os, (sig + 1L));
if (os == NULL)
return (ENOMEM);
Modified: trunk/varnish-cache/lib/libvarnish/vlu.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vlu.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvarnish/vlu.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -64,7 +64,7 @@
l->priv = priv;
l->bufl = bufsize - 1;
l->telnet = -1;
- l->buf = malloc(l->bufl + 1);
+ l->buf = malloc(l->bufl + 1L);
if (l->buf == NULL) {
FREE_OBJ(l);
l = NULL;
Modified: trunk/varnish-cache/lib/libvcl/vcc_acl.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_acl.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvcl/vcc_acl.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -40,7 +40,6 @@
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
#include "vsb.h"
#include "vrt.h"
Modified: trunk/varnish-cache/lib/libvcl/vcc_backend.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_backend.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvcl/vcc_backend.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -137,7 +137,7 @@
"Please specify which exact address "
"you want to use, we found these:\n",
PF(t_host), multiple);
- for (res = res0; res; res = res->ai_next) {
+ for (res = res0; res != NULL; res = res->ai_next) {
error = getnameinfo(res->ai_addr,
res->ai_addrlen, hbuf, sizeof hbuf,
NULL, 0, NI_NUMERICHOST);
Modified: trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvcl/vcc_fixed_token.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4208 2009-08-24 14:51:26Z kristian $
*
* NB: This file is machine generated, DO NOT EDIT!
*
@@ -159,9 +159,10 @@
/* ../../include/vcl.h */
- vsb_cat(sb, "/*\n * $Id$\n *\n * NB: This file is machine generate");
- vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
- vsb_cat(sb, "en.tcl instead\n */\n\nstruct sess;\n");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4208 2009-08-24 14");
+ vsb_cat(sb, ":51:26Z kristian $\n *\n * NB: This file is machine g");
+ vsb_cat(sb, "enerated, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fi");
+ vsb_cat(sb, "xed_token.tcl instead\n */\n\nstruct sess;\n");
vsb_cat(sb, "struct cli;\n\ntypedef void vcl_init_f(struct cli *);\n");
vsb_cat(sb, "typedef void vcl_fini_f(struct cli *);\n");
vsb_cat(sb, "typedef int vcl_func_f(struct sess *sp);\n");
@@ -227,15 +228,15 @@
vsb_cat(sb, " * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWI");
vsb_cat(sb, "SE) ARISING IN ANY WAY\n * OUT OF THE USE OF THIS SOFT");
vsb_cat(sb, "WARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n");
- vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id$\n *\n");
- vsb_cat(sb, " * Runtime support for compiled VCL programs.\n");
- vsb_cat(sb, " *\n * XXX: When this file is changed, lib/libvcl/vcc_");
- vsb_cat(sb, "gen_fixed_token.tcl\n * XXX: *MUST* be rerun.\n");
- vsb_cat(sb, " */\n\nstruct sess;\nstruct vsb;\n");
- vsb_cat(sb, "struct cli;\nstruct director;\n");
- vsb_cat(sb, "struct VCL_conf;\nstruct sockaddr;\n");
- vsb_cat(sb, "\n/*\n * A backend probe specification\n");
- vsb_cat(sb, " */\n\nextern void *vrt_magic_string_end;\n");
+ vsb_cat(sb, " * SUCH DAMAGE.\n *\n * $Id: vrt.h 4185 2009-08-17 11:");
+ vsb_cat(sb, "53:01Z phk $\n *\n * Runtime support for compiled VCL ");
+ vsb_cat(sb, "programs.\n *\n * XXX: When this file is changed, lib/");
+ vsb_cat(sb, "libvcl/vcc_gen_fixed_token.tcl\n");
+ vsb_cat(sb, " * XXX: *MUST* be rerun.\n */\n");
+ vsb_cat(sb, "\nstruct sess;\nstruct vsb;\nstruct cli;\n");
+ vsb_cat(sb, "struct director;\nstruct VCL_conf;\n");
+ vsb_cat(sb, "struct sockaddr;\n\n/*\n * A backend probe specificati");
+ vsb_cat(sb, "on\n */\n\nextern void *vrt_magic_string_end;\n");
vsb_cat(sb, "\nstruct vrt_backend_probe {\n\tconst char\t*url;\n");
vsb_cat(sb, "\tconst char\t*request;\n\tdouble\t\ttimeout;\n");
vsb_cat(sb, "\tdouble\t\tinterval;\n\tunsigned\twindow;\n");
@@ -281,9 +282,9 @@
vsb_cat(sb, " const char *,\n void *, const char *);\n");
vsb_cat(sb, "\nvoid VRT_panic(struct sess *sp, const char *, ...);\n");
vsb_cat(sb, "void VRT_purge(struct sess *sp, char *, ...);\n");
- vsb_cat(sb, "void VRT_purge_string(struct sess *sp, char *, ...);\n");
- vsb_cat(sb, "\nvoid VRT_count(const struct sess *, unsigned);\n");
- vsb_cat(sb, "int VRT_rewrite(const char *, const char *);\n");
+ vsb_cat(sb, "void VRT_purge_string(struct sess *sp, const char *, .");
+ vsb_cat(sb, "..);\n\nvoid VRT_count(const struct sess *, unsigned);");
+ vsb_cat(sb, "\nint VRT_rewrite(const char *, const char *);\n");
vsb_cat(sb, "void VRT_error(struct sess *, unsigned, const char *);");
vsb_cat(sb, "\nint VRT_switch_config(const char *);\n");
vsb_cat(sb, "\nenum gethdr_e { HDR_REQ, HDR_RESP, HDR_OBJ, HDR_BERE");
@@ -316,25 +317,27 @@
/* ../../include/vrt_obj.h */
- vsb_cat(sb, "/*\n * $Id$\n *\n * NB: This file is machine generate");
- vsb_cat(sb, "d, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fixed_tok");
- vsb_cat(sb, "en.tcl instead\n */\n\nstruct sockaddr * VRT_r_client_");
- vsb_cat(sb, "ip(const struct sess *);\nstruct sockaddr * VRT_r_serv");
- vsb_cat(sb, "er_ip(struct sess *);\nconst char * VRT_r_server_hostn");
- vsb_cat(sb, "ame(struct sess *);\nconst char * VRT_r_server_identit");
- vsb_cat(sb, "y(struct sess *);\nint VRT_r_server_port(struct sess *");
- vsb_cat(sb, ");\nconst char * VRT_r_req_request(const struct sess *");
- vsb_cat(sb, ");\nvoid VRT_l_req_request(const struct sess *, const ");
- vsb_cat(sb, "char *, ...);\nconst char * VRT_r_req_url(const struct");
- vsb_cat(sb, " sess *);\nvoid VRT_l_req_url(const struct sess *, con");
- vsb_cat(sb, "st char *, ...);\nconst char * VRT_r_req_proto(const s");
- vsb_cat(sb, "truct sess *);\nvoid VRT_l_req_proto(const struct sess");
- vsb_cat(sb, " *, const char *, ...);\nvoid VRT_l_req_hash(struct se");
- vsb_cat(sb, "ss *, const char *);\nstruct director * VRT_r_req_back");
- vsb_cat(sb, "end(struct sess *);\nvoid VRT_l_req_backend(struct ses");
- vsb_cat(sb, "s *, struct director *);\nint VRT_r_req_restarts(const");
- vsb_cat(sb, " struct sess *);\ndouble VRT_r_req_grace(struct sess *");
- vsb_cat(sb, ");\nvoid VRT_l_req_grace(struct sess *, double);\n");
+ vsb_cat(sb, "/*\n * $Id: vcc_gen_fixed_token.tcl 4208 2009-08-24 14");
+ vsb_cat(sb, ":51:26Z kristian $\n *\n * NB: This file is machine g");
+ vsb_cat(sb, "enerated, DO NOT EDIT!\n *\n * Edit and run vcc_gen_fi");
+ vsb_cat(sb, "xed_token.tcl instead\n */\n\nstruct sockaddr * VRT_r_");
+ vsb_cat(sb, "client_ip(const struct sess *);\n");
+ vsb_cat(sb, "struct sockaddr * VRT_r_server_ip(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_server_hostname(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_server_identity(struct sess *);\n");
+ vsb_cat(sb, "int VRT_r_server_port(struct sess *);\n");
+ vsb_cat(sb, "const char * VRT_r_req_request(const struct sess *);\n");
+ vsb_cat(sb, "void VRT_l_req_request(const struct sess *, const char");
+ vsb_cat(sb, " *, ...);\nconst char * VRT_r_req_url(const struct ses");
+ vsb_cat(sb, "s *);\nvoid VRT_l_req_url(const struct sess *, const c");
+ vsb_cat(sb, "har *, ...);\nconst char * VRT_r_req_proto(const struc");
+ vsb_cat(sb, "t sess *);\nvoid VRT_l_req_proto(const struct sess *, ");
+ vsb_cat(sb, "const char *, ...);\nvoid VRT_l_req_hash(struct sess *");
+ vsb_cat(sb, ", const char *);\nstruct director * VRT_r_req_backend(");
+ vsb_cat(sb, "struct sess *);\nvoid VRT_l_req_backend(struct sess *,");
+ vsb_cat(sb, " struct director *);\nint VRT_r_req_restarts(const str");
+ vsb_cat(sb, "uct sess *);\ndouble VRT_r_req_grace(struct sess *);\n");
+ vsb_cat(sb, "void VRT_l_req_grace(struct sess *, double);\n");
vsb_cat(sb, "const char * VRT_r_req_xid(struct sess *);\n");
vsb_cat(sb, "unsigned VRT_r_req_esi(struct sess *);\n");
vsb_cat(sb, "void VRT_l_req_esi(struct sess *, unsigned);\n");
Modified: trunk/varnish-cache/lib/libvcl/vcc_obj.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_obj.c 2009-09-08 18:19:52 UTC (rev 4234)
+++ trunk/varnish-cache/lib/libvcl/vcc_obj.c 2009-09-11 13:06:15 UTC (rev 4235)
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id: vcc_gen_fixed_token.tcl 4208 2009-08-24 14:51:26Z kristian $
*
* NB: This file is machine generated, DO NOT EDIT!
*
More information about the varnish-commit
mailing list