aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.c
AgeCommit message (Expand)AuthorFilesLines
2016-02-23Making wiretap option blocks more generic.Michael Mann1-85/+116
2016-02-11Make file indices consistently unsigned in the merge code.Guy Harris1-6/+6
2016-02-11Avoid undefined behavior in overflow checkMichael McConville1-1/+1
2015-11-23merge: fix parameter 'in_files/in_count_files' not found in the function decl...Alexis La Goutte1-6/+6
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris1-43/+46
2015-11-10Fix typo.Guy Harris1-1/+1
2015-10-05Allow use of variadic macrosPeter Wu1-34/+28
2015-08-21Fix memory leaks of dumper SHB and IDB infosHadriel Kaplan1-5/+15
2015-08-19Pcap: wtap does not set interface timestamp precision when reading pcapHadriel Kaplan1-1/+1
2015-08-19Add more debug infor for windows buildbot test suite failureHadriel Kaplan1-0/+27
2015-08-19Try to debug merge test suite failure on windows buildbotHadriel Kaplan1-0/+30
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-6/+704
2015-08-14Ident the merge.c/h files by 4 spacesHadriel Kaplan1-141/+141
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris1-4/+0
2015-01-03Remove unnecessary includes from wiretap folderMartin Mathieson1-2/+0
2015-01-02Add "Editor modelines"; Adjust whitespace as needed.Bill Meier1-0/+13
2014-09-22Try to fix some buildbot warningsMichal Labedzki1-2/+3
2014-05-09Revert "Refactor Wiretap"Guy Harris1-14/+13
2014-05-09Refactor WiretapMichael Mann1-13/+14
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki1-1/+1
2013-11-09Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki1-2/+3
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-0/+286
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:49:59 +0000