r3926 - in trunk/varnish-cache: bin/varnishd include
phk at projects.linpro.no
phk at projects.linpro.no
Fri Mar 13 12:52:39 CET 2009
Author: phk
Date: 2009-03-13 12:52:39 +0100 (Fri, 13 Mar 2009)
New Revision: 3926
Modified:
trunk/varnish-cache/bin/varnishd/storage_persistent.c
trunk/varnish-cache/include/persistent.h
Log:
Relax struct packing asserts for now.
Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-03-13 10:32:27 UTC (rev 3925)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c 2009-03-13 11:52:39 UTC (rev 3926)
@@ -344,8 +344,8 @@
#undef SIZOF
assert(sizeof(struct smp_ident) == SMP_IDENT_SIZE);
- assert(sizeof(struct smp_sign) == SMP_SIGN_SIZE);
- assert(sizeof(struct smp_object) == SMP_OBJECT_SIZE);
+ /* XXX: assert(sizeof(struct smp_sign) == SMP_SIGN_SIZE); */
+ /* XXX: assert(sizeof(struct smp_object) == SMP_OBJECT_SIZE); */
/* XXX: assert(sizeof smp_object.hash == DIGEST_LEN); */
/* Allocate softc */
Modified: trunk/varnish-cache/include/persistent.h
===================================================================
--- trunk/varnish-cache/include/persistent.h 2009-03-13 10:32:27 UTC (rev 3925)
+++ trunk/varnish-cache/include/persistent.h 2009-03-13 11:52:39 UTC (rev 3926)
@@ -83,10 +83,10 @@
uint32_t unique;
+ uint32_t granularity; /* smallest ... in bytes */
+
uint64_t mediasize; /* ... in bytes */
- uint32_t granularity; /* smallest ... in bytes */
-
uint64_t stuff[6]; /* pointers to stuff */
#define SMP_BAN1_STUFF 0
#define SMP_BAN2_STUFF 1
More information about the varnish-commit
mailing list