git.samba.org - metze/wireshark/wip.git/commit

git.samba.org / metze / wireshark / wip.git / commit

author	Guy Harris <guy@alum.mit.edu>
	Sun, 4 Dec 2016 01:57:34 +0000 (17:57 -0800)
committer	Guy Harris <guy@alum.mit.edu>
	Sun, 4 Dec 2016 03:12:23 +0000 (03:12 +0000)
commit	dd98856afce144eb19104a6f40c1abedc9069558
tree	2136bbdee3544f4324bf214a78aff65da350682c	tree
parent	5aede1bc50b6bb9ae13926e2249d22d95c12814e	commit \| diff

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@alum.mit.edu>

debian/libwiretap0.symbols		diff \| blob \| history
file.c		diff \| blob \| history
file.h		diff \| blob \| history
mergecap.c		diff \| blob \| history
ui/gtk/capture_file_dlg.c		diff \| blob \| history
ui/gtk/drag_and_drop.c		diff \| blob \| history
ui/qt/main_window.cpp		diff \| blob \| history
wiretap/merge.c		diff \| blob \| history
wiretap/merge.h		diff \| blob \| history

Unnamed repository; edit this file to name it for gitweb.

RSS Atom