r754 - in trunk/varnish-cache: bin/varnishd lib/libvcl
phk at projects.linpro.no
phk at projects.linpro.no
Mon Aug 7 23:08:21 CEST 2006
Author: phk
Date: 2006-08-07 23:08:20 +0200 (Mon, 07 Aug 2006)
New Revision: 754
Modified:
trunk/varnish-cache/bin/varnishd/cache_acceptor.c
trunk/varnish-cache/bin/varnishd/varnishd.c
trunk/varnish-cache/lib/libvcl/vcc_compile.c
trunk/varnish-cache/lib/libvcl/vcc_token.c
Log:
64bit changes
Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2006-08-07 21:01:40 UTC (rev 753)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2006-08-07 21:08:20 UTC (rev 754)
@@ -6,8 +6,8 @@
* write the session pointer to a pipe which the event engine monitors.
*/
-#define ACCEPTOR_USE_POLL
-#undef ACCEPTOR_USE_KQUEUE
+#undef ACCEPTOR_USE_POLL
+#define ACCEPTOR_USE_KQUEUE
#include <stdio.h>
#include <errno.h>
Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 21:01:40 UTC (rev 753)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c 2006-08-07 21:08:20 UTC (rev 754)
@@ -63,8 +63,8 @@
} else if (!cmp_hash(&hsl_slinger, sflag, p)) {
hp = &hsl_slinger;
} else {
- fprintf(stderr, "Unknown hash method \"%*.*s\"\n",
- p - sflag, p - sflag, sflag);
+ fprintf(stderr, "Unknown hash method \"%.*s\"\n",
+ (int)(p - sflag), sflag);
exit (2);
}
heritage.hash = hp;
@@ -108,8 +108,8 @@
} else if (!cmp_storage(&smf_stevedore, sflag, p)) {
stp = &smf_stevedore;
} else {
- fprintf(stderr, "Unknown storage method \"%*.*s\"\n",
- p - sflag, p - sflag, sflag);
+ fprintf(stderr, "Unknown storage method \"%.*s\"\n",
+ (int)(p - sflag), sflag);
exit (2);
}
heritage.stevedore = malloc(sizeof *heritage.stevedore);
Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c 2006-08-07 21:01:40 UTC (rev 753)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c 2006-08-07 21:08:20 UTC (rev 754)
@@ -420,7 +420,7 @@
v->name = p;
v->fmt = STRING;
asprintf(&p, "VRT_GetHdr(sp, \"\\%03o%s:\")",
- strlen(v->name + vh->len) + 1, v->name + vh->len);
+ (unsigned)(strlen(v->name + vh->len) + 1), v->name + vh->len);
assert(p != NULL);
v->rname = p;
return (v);
Modified: trunk/varnish-cache/lib/libvcl/vcc_token.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_token.c 2006-08-07 21:01:40 UTC (rev 753)
+++ trunk/varnish-cache/lib/libvcl/vcc_token.c 2006-08-07 21:08:20 UTC (rev 754)
@@ -180,9 +180,8 @@
TAILQ_INSERT_TAIL(&tl->tokens, t, list);
tl->t = t;
if (0) {
- fprintf(stderr, "[%s %*.*s] ",
- vcl_tnames[tok],
- e - b, e - b, b);
+ fprintf(stderr, "[%s %.*s] ",
+ vcl_tnames[tok],(int)(e - b), b);
if (tok == EOI)
fprintf(stderr, "\n");
}
More information about the varnish-commit
mailing list