diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-12-03 17:57:34 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-12-04 03:12:23 +0000 |
| commit | dd98856afce144eb19104a6f40c1abedc9069558 (patch) | |
| tree | 2136bbdee3544f4324bf214a78aff65da350682c /debian | |
| parent | 5aede1bc50b6bb9ae13926e2249d22d95c12814e (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>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libwiretap0.symbols | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/libwiretap0.symbols b/debian/libwiretap0.symbols index 683ac16f73..f92a210f5f 100644 --- a/debian/libwiretap0.symbols +++ b/debian/libwiretap0.symbols @@ -10,6 +10,8 @@ libwiretap.so.0 libwiretap0 #MINVER# file_tell@Base 1.9.1 init_open_routines@Base 1.12.0~rc1 merge_files@Base 1.99.9 + merge_files_to_stdout@Base 2.3.0 + merge_files_to_tempfile@Base 2.3.0 merge_idb_merge_mode_to_string@Base 1.99.9 merge_string_to_idb_merge_mode@Base 1.99.9 open_info_name_to_type@Base 1.12.0~rc1 |