diff options
| author | Dario Lombardo <lomato@gmail.com> | 2017-12-25 23:12:55 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-12-26 12:00:06 +0000 |
| commit | c18bc1291d42423e907d2ce0b3d4f39ecd59e675 (patch) | |
| tree | 61b8456497f7c2c14ed44a6a78655d39fb139256 /wiretap/merge.c | |
| parent | 62f06b71962063736bfa359074802e3a51271308 (diff) | |
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 <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |