From c18bc1291d42423e907d2ce0b3d4f39ecd59e675 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Mon, 25 Dec 2017 23:12:55 +0100 Subject: wiretap: remove unneeded check (CID: 1396988). Existence of in_file has been checked in line 908. Change-Id: Ida6c06362a1f88caec40701be7f3e42133ce404a Reviewed-on: https://code.wireshark.org/review/24994 Reviewed-by: Anders Broman --- wiretap/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wiretap/merge.c') diff --git a/wiretap/merge.c b/wiretap/merge.c index 0f3c801740..efe4089ead 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -910,7 +910,7 @@ merge_process_packets(wtap_dumper *pdh, const int file_type, *err_framenum = 0; } else { *err_fileno = (guint)(in_file - in_files); - *err_framenum = in_file ? in_file->packet_num : 0; + *err_framenum = in_file->packet_num; } return status; -- cgit v1.2.3