aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2004-01-25Free the error info string after using it.Guy Harris1-1/+2
2004-01-25Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris1-6/+27
2004-01-18Fix warnings found by -Wstrict-prototypesJörg Mayer1-2/+2
2004-01-18Output the result of -h to stdout, not stderrJörg Mayer1-18/+18
2004-01-18Nice rendering of the CVS version as "(cvs 200401181200003000)".Olivier Biot1-2/+6
2004-01-16In case of CVS sources, add the date of the last change to the versionJörg Mayer1-2/+3
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-19/+19
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-9/+5
2002-06-23WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3'sGuy Harris1-3/+3
2002-03-31From Joerg Mayer: mark function arguments as unused.Guy Harris1-2/+2
2002-02-24From Peter Valchev: fix editcap to assign the result of "getopt()" to anGuy Harris1-2/+2
2002-02-08Have Wiretap set the snapshot length to 0 if it can't be derived fromGuy Harris1-3/+9
2001-10-04Use longs as file offsets, so that on platforms with 64-bit "long" weGuy Harris1-3/+3
2001-07-20Get rid of some unused variables.Guy Harris1-4/+1
2001-07-14From Scott Renfro: correctly handle merging multiple files withGuy Harris1-7/+53
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris1-140/+265
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-0/+330