From 30c86f8b34233b1cf262c14660d32388bc7362d9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 3 Jun 2017 12:58:36 -0700 Subject: Don't keep the pcap/pcapng link-layer header type as interface data. Either 1) it can be determined from the libwiretap encapsulation type, in which case it's redundant information or 2) there *is* no pcap/pcapng link-layer header type for that encapsulation type, in which case you need to check for the attempt to determine it failing and handle that failure appropriately. Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc Reviewed-on: https://code.wireshark.org/review/21924 Reviewed-by: Guy Harris --- wiretap/merge.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'wiretap/merge.c') diff --git a/wiretap/merge.c b/wiretap/merge.c index 8605b7fbeb..0ba1b81a66 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -460,14 +460,6 @@ is_duplicate_idb(const wtap_block_t idb1, const wtap_block_t idb2) return FALSE; } - merge_debug("idb1_mand->link_type == idb2_mand->link_type: %s", - (idb1_mand->link_type == idb2_mand->link_type) ? "TRUE":"FALSE"); - if (idb1_mand->link_type != idb2_mand->link_type) { - /* Clearly not the same interface. */ - merge_debug("merge::is_duplicate_idb() returning FALSE"); - return FALSE; - } - merge_debug("idb1_mand->time_units_per_second == idb2_mand->time_units_per_second: %s", (idb1_mand->time_units_per_second == idb2_mand->time_units_per_second) ? "TRUE":"FALSE"); if (idb1_mand->time_units_per_second != idb2_mand->time_units_per_second) { -- cgit v1.2.1