diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-16 21:50:57 +0000 |
| commit | 78631020b83c7aab12934f0cff72dbb5e3f0ba4a (patch) | |
| tree | 826f6248fcdb37ec849abebc3bdcc650e0df6c61 /mergecap.c | |
| parent | d7ae273d7a2373ab6fcc1c58d235b4a7dc4df0e9 (diff) | |
| download | wireshark-78631020b83c7aab12934f0cff72dbb5e3f0ba4a.tar.gz wireshark-78631020b83c7aab12934f0cff72dbb5e3f0ba4a.tar.bz2 wireshark-78631020b83c7aab12934f0cff72dbb5e3f0ba4a.zip | |
Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.
svn path=/trunk/; revision=45601
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 8ebed8789e..685b0da686 100644 --- a/mergecap.c +++ b/mergecap.c @@ -448,8 +448,7 @@ main(int argc, char *argv[]) phdr = &snap_phdr; } - if (!wtap_dump(pdh, phdr, wtap_pseudoheader(in_file->wth), - wtap_buf_ptr(in_file->wth), &write_err)) { + if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err)) { got_write_error = TRUE; break; } |