Wireshark-commits: [Wireshark-commits] master b3c5fcb: Make some code common between pcap and no-pc
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b3c5fcb67c89e0f9bcc4e38861f23d90792a0e7e
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
b3c5fcb by Guy Harris (guy@xxxxxxxxxxxx):
Make some code common between pcap and no-pcap TShark.
Set the output_file_name variable for -w regardless of whether we were
built with libpcap or not. If we were built with libpcap, also pass the
flag and its argument to capture_opts_add_opt().
In the reading-a-file code (rather than the doing-a-live-capture code),
use output_file_name as the name of the output file, regardless of
whether we were built with libpcap or not.
This takes a few twists out of the maze of #ifdefs, all different.
Change-Id: I828f1b04dacbf0ea4f3aff36f26cb9a3ffcbc480
Reviewed-on: https://code.wireshark.org/review/32011
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from b503613 Add macros for the pack_flags field.
add b3c5fcb Make some code common between pcap and no-pcap TShark.
Summary of changes:
tshark.c | 63 +++++++++++++++++++++++++++++----------------------------------
1 file changed, 29 insertions(+), 34 deletions(-)