From 64ec2b2e5ed590a6f1a3d22c8b24a6e70420d1f9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 20 Apr 2017 13:25:21 -0700 Subject: Take the error message generation out of the merge_files routines. Have them just return the information needed for the caller to produce an error message, and have the callers use the new cfile_ routines for reporting errors. This requires that the "write failure alert box" routine take the *input* file name as an argument, so that, on a merge, if the problem is that a record from a given input file can't be written out to the type of output file we're generating, the input file name can be given, along with the record number in that file. Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71 Reviewed-on: https://code.wireshark.org/review/21257 Reviewed-by: Guy Harris --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b0ef9dea85..dc2b9550e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2407,6 +2407,7 @@ endif() if(BUILD_mergecap) set(mergecap_LIBS + ui wiretap ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} -- cgit v1.2.1