r1256 - in branches/1.0: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-02-20 09:46:56 +0100 (Tue, 20 Feb 2007)
New Revision: 1256

Modified:
   branches/1.0/
   branches/1.0/bin/varnishd/shmlog.c
Log:
 r34132 at cat (orig r1236):  phk | 2007-01-22 12:46:25 +0100
 Use struct assignment to overcome volatile poisoning.
 



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1235
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1236

Modified: branches/1.0/bin/varnishd/shmlog.c
===================================================================
--- branches/1.0/bin/varnishd/shmlog.c	2007-02-20 08:46:54 UTC (rev 1255)
+++ branches/1.0/bin/varnishd/shmlog.c	2007-02-20 08:46:56 UTC (rev 1256)
@@ -365,6 +365,6 @@
 	xxxassert(loghead != MAP_FAILED);
 	VSL_stats = &loghead->stats;
 	pp = (void *)(loghead + 1);
-	memcpy(pp, params, sizeof *pp);
+	*pp = *params;
 	params = pp;
 }