Wireshark-commits: [Wireshark-commits] master 204dc92: wiretap/merge.c: consolidate three similar m
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=204dc92717a7b6cc2765dc0563a4d353ea0a21d7
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
204dc92 by Peter Wu (peter@xxxxxxxxxxxxx):
wiretap/merge.c: consolidate three similar merge_files routines
The three merge_files routines (filename, tempfile, stdout) have exactly
the same code except for a single wtap_dump_open routine. Reduce code
duplication to ease further improvements to this file.
Change-Id: I4fa890730d54c11b3614e56cf4d3d3da1ae9f5fd
Reviewed-on: https://code.wireshark.org/review/30678
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 77578b0 Qt: fix build failure due to adding two incompatible pointers
add 204dc92 wiretap/merge.c: consolidate three similar merge_files routines
Summary of changes:
wiretap/merge.c | 225 ++++++++++++--------------------------------------------
1 file changed, 46 insertions(+), 179 deletions(-)