aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2012-06-20Use separate filters for the RTT found on a SACK and the RTT found on amorriss1-1/+23
2012-01-23From Michael Mann:etxrab1-1/+1
2011-12-22Alphabetize the list of encapsulation types via "mergecap -T" as well as the ...cmaynard1-14/+51
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyguy1-2/+2
2011-11-30Hopefully clarify usage a bit to indicate multiple infile's can be specified ...cmaynard1-2/+20
2011-11-30From Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes ...cmaynard1-1/+1
2011-11-21On an I/O error, merge_read_packet() and merge_append_read_packet() needguy1-2/+7
2011-11-19When reporting "sorry, *this* packet can't be written to a file of thatguy1-12/+25
2011-08-09Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :morriss1-3/+1
2011-06-28Replace all strerror() with g_strerror().stig1-1/+1
2011-06-20Have mergecap, tshark, and editcap write pcap-ng files by default. Thisgerald1-1/+5
2011-05-24Move the Windows argument list conversion code to a common routine.gerald1-14/+2
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 togerald1-0/+21
2010-05-28Move some code (including the optional objects) into libwsutilmorriss1-1/+1
2009-10-06Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_Hstig1-4/+4
2009-10-05Fixed a int/long warning.stig1-3/+3
2009-07-22Use "svn info" to fetch the version by default. Fetch the repository path asgerald1-1/+1
2009-05-12Minor cleanup of "-h" output text.wmeier1-12/+12
2008-05-22Move the file utility functions from wiretap to libwsutil so thatmorriss1-5/+5
2008-01-24Fixed some malloc -> g_malloc, free -> g_free, strdup -> g_strdup.stig1-2/+2
2006-05-28Ethereal->Wiresharketxrab1-1/+1
2006-03-30From Martin Mathieson:etxrab1-2/+2
2006-01-10same command line related changes as recently done with editcapulfl1-33/+62
2005-11-06replace *a lot* of file related calls by their GLib counterparts. This is nec...ulfl1-10/+2
2005-09-14added compression support for capture file output. The Save/As dialog now has...ulfl1-1/+1
2004-12-29Make the tone of the error messages a bit less formal, by usingguy1-3/+3
2004-10-29The common merge code merely needs to offer the abstraction of routinesguy1-33/+59
2004-10-28Make "merge_files()" and "merge_append_files()" return a tri-stateguy1-12/+40
2004-10-28Remove all the verbose-mode code from merge.c, and put most of it inguy1-14/+67
2004-10-27Change some of the merge.c APIs to return more information on failure,guy1-31/+78
2004-10-27Check whether any input files were specified, and print an error forguy1-0/+4
2004-07-18Set the svn:eol-style property on all text files to "native", so thatguy1-1/+1
2004-07-15Convert make-version.pl and the associated cvsversion.h and CVSVERSIONgerald1-3/+3
2004-07-13If we fail to open the output file, report the reason why.guy1-5/+7
2004-07-12bugfix to a bug reported by jprakashbabu@hotpop.com:ulfl1-6/+6
2004-06-30Initialize "out_filename" to NULL, so it's set to NULL if it's not setguy1-3/+3
2004-06-30On at least some platforms, a #define of O_BINARY is needed even ifguy1-1/+5
2004-06-29avoid using tmpnam() for security reasons.ulfl1-4/+26
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),ulfl1-351/+16
2004-03-04Undo an unnecessary changejmayer1-2/+2
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -jmayer1-1/+6
2004-02-20Add support for a "version.conf" file in the main directory which cangerald1-2/+2
2004-01-25Free the error info string after using it.guy1-1/+2
2004-01-25Have the Wiretap open, read, and seek-and-read routines return, inguy1-6/+27
2004-01-18Fix warnings found by -Wstrict-prototypesjmayer1-2/+2
2004-01-18Output the result of -h to stdout, not stderrjmayer1-18/+18
2004-01-18Nice rendering of the CVS version as "(cvs 200401181200003000)".obiot1-2/+6
2004-01-16In case of CVS sources, add the date of the last change to the versionjmayer1-2/+3
2002-08-28Removed trailing whitespaces from .h and .c files using thejmayer1-19/+19
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hjmayer1-9/+5