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 /reordercap.c | |
parent | 5acabc99b0755be8d199d20f5aff96c3e3873845 (diff) |
No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().
svn path=/trunk/; revision=54570
Diffstat (limited to 'reordercap.c')
-rw-r--r-- | reordercap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/reordercap.c b/reordercap.c index c7c075c8d8..b43ca318f2 100644 --- a/reordercap.c +++ b/reordercap.c @@ -70,7 +70,6 @@ static void usage(gboolean is_error) /* Remember where this frame was in the file */ typedef struct FrameRecord_t { gint64 offset; - guint32 length; guint num; nstime_t time; @@ -99,13 +98,12 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh, Buffer *buf, gchar *err_info; struct wtap_pkthdr phdr; - DEBUG_PRINT("\nDumping frame (offset=%" G_GINT64_MODIFIER "u, length=%u)\n", - frame->offset, frame->length); + DEBUG_PRINT("\nDumping frame (offset=%" G_GINT64_MODIFIER "u)\n", + frame->offset); /* Re-read the first frame from the stored location */ - if (!wtap_seek_read(wth, frame->offset, &phdr, buf, frame->length, - &err, &err_info)) { + if (!wtap_seek_read(wth, frame->offset, &phdr, buf, &err, &err_info)) { if (err != 0) { /* Print a message noting that the read failed somewhere along the line. */ fprintf(stderr, @@ -267,7 +265,6 @@ int main(int argc, char *argv[]) newFrameRecord = g_slice_new(FrameRecord_t); newFrameRecord->num = frames->len + 1; newFrameRecord->offset = data_offset; - newFrameRecord->length = phdr->len; newFrameRecord->time = phdr->ts; if (prevFrame && frames_compare(&newFrameRecord, &prevFrame) < 0) { |