From 9d41c658fe5b003d3a16646d1d05da8c68596b01 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 2 Jan 2014 20:47:21 +0000 Subject: No seek-read routines use the length argument, so eliminate it from wtap_seek_read(). svn path=/trunk/; revision=54570 --- frame_tvbuff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'frame_tvbuff.c') diff --git a/frame_tvbuff.c b/frame_tvbuff.c index 61ab0fa84f..acecd0945d 100644 --- a/frame_tvbuff.c +++ b/frame_tvbuff.c @@ -56,10 +56,10 @@ frame_read(struct tvb_frame *frame_tvb, struct wtap_pkthdr *phdr, Buffer *buf) if (cfile.wth != frame_tvb->wth) return FALSE; - /* XXX, frame_tvb->tvb.length + frame_tvb->offset might be not real captured packet length - * can it cause some problems for wiretap readers? + /* XXX, what if phdr->caplen isn't equal to + * frame_tvb->tvb.length + frame_tvb->offset? */ - if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, frame_tvb->tvb.length + frame_tvb->offset, &err, &err_info)) { + if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) { switch (err) { case WTAP_ERR_UNSUPPORTED_ENCAP: case WTAP_ERR_BAD_FILE: -- cgit v1.2.3