diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-02 20:47:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-02 20:47:21 +0000 |
| commit | 9d41c658fe5b003d3a16646d1d05da8c68596b01 (patch) | |
| tree | 9cfbf155885a14d5e1d7b1aeff3b277b3fafedc0 /frame_tvbuff.c | |
| parent | 5acabc99b0755be8d199d20f5aff96c3e3873845 (diff) | |
| download | wireshark-9d41c658fe5b003d3a16646d1d05da8c68596b01.tar.gz | |
No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().
svn path=/trunk/; revision=54570
Diffstat (limited to 'frame_tvbuff.c')
| -rw-r--r-- | frame_tvbuff.c | 6 |
1 files changed, 3 insertions, 3 deletions
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: |