summaryrefslogtreecommitdiffstats
path: root/lib/vio_fifo.c
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-03-29 14:22:37 +0100
committerChris Hall <chris.hall@highwayman.com>2011-03-29 14:22:37 +0100
commit7e666be965b3ac61b05ccdeca2b61902bc26e172 (patch)
treedc4c1b7985b1aa3dfd16b59c70567f62ab535fd6 /lib/vio_fifo.c
parentf9956b9524ddafdb9d0cec042213eaa8229aad8c (diff)
parente20f7ccd9e110fcd5deb945f8d23922efd8b0822 (diff)
downloadquagga-ex16p.tar.bz2
quagga-ex16p.tar.xz
Merge branch 'master' of /git/quagga.euro-ix into pipeworkex16p
This ensures that the two branches are consistent after the merging of the old-Quagga 0.99.18 changes. Release: 0.99.18ex16p. Eliminated some whitespace differences ! Collected RESTRICTED_NODE show_bgp_ipv6_safi_route_cmd and show_bgp_ipv6_safi_prefix_cmd, and one HAVE_IPV6 skip. Also releasing filename in closezlog(). Removed strlen() from lib/qfstring.c for async-signal-safe purposes.
Diffstat (limited to 'lib/vio_fifo.c')
-rw-r--r--lib/vio_fifo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vio_fifo.c b/lib/vio_fifo.c
index 52e0d2df..65f19411 100644
--- a/lib/vio_fifo.c
+++ b/lib/vio_fifo.c
@@ -332,7 +332,7 @@ vio_fifo_new(ulen size)
if (vio_fifo_debug)
size = 29 ;
- total_size = offsetof(struct vio_fifo, own_lump->data[size]) ;
+ total_size = offsetof(struct vio_fifo, own_lump[0].data[size]) ;
vff = XCALLOC(MTYPE_VIO_FIFO, total_size) ;