aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2018-10-08Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.Guy Harris1-7/+4
2018-10-07Use wsetargv.obj, and wmain() rather than main(), on Windows.Guy Harris1-5/+22
2018-05-05Don't use dladdr() to get a pathname for the current executable().Guy Harris1-1/+1
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo1-1/+1
2018-02-05Speak of records, not packets.Guy Harris1-1/+1
2018-01-09wiretap: add a parameter to wtap_init() indicating whether plugins must be lo...Pascal Quantin1-1/+1
2017-12-14Refactor plugin registration and loadingJoão Valverde1-19/+1
2017-11-09Start using SPDX license identifiers.Gerald Combs1-13/+1
2017-09-26Rename "ws_version_info.h", also .cJoão Valverde1-1/+1
2017-04-29Eliminate some double-frees.Guy Harris1-2/+0
2017-04-20mergecap: remove a now useless variablePascal Quantin1-2/+0
2017-04-20Take the error message generation out of the merge_files routines.Guy Harris1-13/+26
2017-04-08Clean up handling of enabled/disabled protocols/heuristic dissectors.Guy Harris1-4/+6
2017-02-22mergecap: free memory on shutdown.Dario Lombardo1-0/+4
2017-02-14wiretap: add cleanup routine.Dario Lombardo1-8/+15
2016-12-05Clean up initialization code for programs.Guy Harris1-19/+22
2016-12-04Have a routine to do all the work of initializing libwiretap.Guy Harris1-4/+2
2016-12-04Have separate merge APIs for regular file/temporary file/standard output.Guy Harris1-20/+18
2016-09-11More signed vs. unsigned argument cleanups.Guy Harris1-2/+2
2016-09-10Fix version-string releated memleak for some CLI toolsPeter Wu1-0/+4
2016-09-05Have scan_plugins() take an argument specify what to do on load failures.Guy Harris1-7/+11
2016-08-10Remove unneeded include.Guy Harris1-1/+0
2016-04-21Link version code statically againJoão Valverde1-1/+1
2016-04-04Include ws_diag_control.h in config.hJoão Valverde1-1/+0
2016-04-03Move zlib version check to wsutilJoão Valverde1-38/+2
2016-03-28Fix warnings/errors of type -Wused-but-marked-unusedJoerg Mayer1-1/+6
2016-03-26Fix compile errors when compiling w/o zlibDaniël van Eeden1-1/+1
2016-03-06To see whether a string equals another string, just use strcmp().Guy Harris1-1/+1
2016-03-03We need to include <wsutil/privileges.h> for those functions.Guy Harris1-0/+1
2016-03-03Add missing initialization calls.Guy Harris1-1/+8
2016-03-03Refactor wiretap option block types into a registration system.Michael Mann1-0/+43
2016-01-06Clean up more includes of wtap.h.Guy Harris1-1/+2
2015-12-12Remove -Wwrite-strings compiler flagJoão Valverde1-4/+2
2015-11-11Update user guide for development releasePascal Quantin1-1/+1
2015-11-07Clean up includes of unistd.h, fcntl.h, and sys/stat.h.Guy Harris1-8/+0
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-336/+127
2015-08-06Pcapng: support Name Resolution Block optionsHadriel Kaplan1-1/+1
2015-06-25mergecap: check input files time precision before exporting to pcapng formatPascal Quantin1-2/+39
2015-05-10mergecap: fix merge of files with different encapsulation typesPascal Quantin1-1/+52
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris1-4/+0
2015-02-20Suppress a bunch of cast-qual warnings.Gerald Combs1-2/+5
2015-02-09(Trivial) Fix printf-related 'Mismatch on sign' warningsBill Meier1-1/+1
2014-12-31Do the full string in get_{compiled,runtime}_version_info().Guy Harris1-6/+4
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris1-2/+0
2014-12-25Only include <wsutil/os_version_info.h> if we need it.Guy Harris1-1/+0
2014-12-25Check for getopt_long(), not getopt().Guy Harris1-1/+1
2014-12-24Move twelve show_version() functions from the varoius programs andStephen Fisher1-16/+1
2014-12-22Fix The left operand of '!=' is a garbage value issue found by Clang AnalyzerAlexis La Goutte1-1/+1
2014-12-18Make sure err_info is always set, and print it iff it's non-null.Guy Harris1-11/+3
2014-12-18WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.Guy Harris1-4/+0