Wireshark-commits: [Wireshark-commits] master dd98856: Have separate merge APIs for regular file/te
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 4 Dec 2016 03:12:47 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dd98856afce144eb19104a6f40c1abedc9069558
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

dd98856 by Guy Harris (guy@xxxxxxxxxxxx):

    Have separate merge APIs for regular file/temporary file/standard output.
    
    This is similar to what we have for opening a dump file - one API that
    uses the file name as specified, one that creates a temporary file and
    provides the file name, and one that uses the standard output.
    
    All of those APIs handle closing the output file.
    
    Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1
    Reviewed-on: https://code.wireshark.org/review/19059
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  5aede1b   Squelch a casting-away-constness warning.
    adds  dd98856   Have separate merge APIs for regular file/temporary file/standard output.


Summary of changes:
 debian/libwiretap0.symbols |    2 +
 file.c                     |   42 ++---
 file.h                     |   12 +-
 mergecap.c                 |   38 ++---
 ui/gtk/capture_file_dlg.c  |    7 +-
 ui/gtk/drag_and_drop.c     |    5 +-
 ui/qt/main_window.cpp      |    7 +-
 wiretap/merge.c            |  392 ++++++++++++++++++++++++++++++++++----------
 wiretap/merge.h            |   55 ++++++-
 9 files changed, 399 insertions(+), 161 deletions(-)