diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-05-17 08:56:43 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-05-17 08:56:43 +0000 |
| commit | 13694fde7b527200330753bcbebf0e65e1f2d438 (patch) | |
| tree | 0c72689ca8bba4a19b272a944738f9da0c3fa307 /wiretap/iptrace.c | |
| parent | ab7487203194b5c20bc273415aa5e2e4af762e97 (diff) | |
Get rid of duplicate code.
svn path=/trunk/; revision=49374
Diffstat (limited to 'wiretap/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index 65ad4cd463..f60456996b 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -442,19 +442,6 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, gchar **err_info, return FALSE; } - /* If the per-file encapsulation isn't known, set it to this - packet's encapsulation. - - If it *is* known, and it isn't this packet's encapsulation, - set it to WTAP_ENCAP_PER_PACKET, as this file doesn't - have a single encapsulation for all packets in the file. */ - if (wth->file_encap == WTAP_ENCAP_UNKNOWN) - wth->file_encap = wth->phdr.pkt_encap; - else { - if (wth->file_encap != wth->phdr.pkt_encap) - wth->file_encap = WTAP_ENCAP_PER_PACKET; - } - /* Read the packet data */ buffer_assure_space( wth->frame_buffer, wth->phdr.caplen ); data_ptr = buffer_start_ptr( wth->frame_buffer ); |