path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2012-05-10Avoid needlessly shadowing another variable.Martin Mathieson1-1/+0
2012-04-25Fix typo.Michael Tüxen1-1/+1
2012-04-25Fix copy and paste error.Michael Tüxen1-1/+1
2012-04-25Fix compilation. While there, remove some trailing whitespaces.Michael Tüxen1-2/+2
2012-04-25use in_files->filenameAnders Broman1-1/+1
2012-04-25Add some info in SHB if writing a pcap-ng file.Anders Broman1-1/+24
2012-01-23From Michael Mann:Anders Broman1-1/+1
2011-12-22Alphabetize the list of encapsulation types via "mergecap -T" as well as the ...Chris Maynard1-14/+51
2011-12-13Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris1-2/+2
2011-11-30Hopefully clarify usage a bit to indicate multiple infile's can be specified ...Chris Maynard1-2/+20
2011-11-30From Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes ...Chris Maynard1-1/+1
2011-11-21On an I/O error, merge_read_packet() and merge_append_read_packet() needGuy Harris1-2/+7
2011-11-19When reporting "sorry, *this* packet can't be written to a file of thatGuy Harris1-12/+25
2011-08-09Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :Jeff Morriss1-3/+1
2011-06-28Replace all strerror() with g_strerror().Stig Bjørlykke1-1/+1
2011-06-20Have mergecap, tshark, and editcap write pcap-ng files by default. ThisGerald Combs1-1/+5
2011-05-24Move the Windows argument list conversion code to a common routine.Gerald Combs1-14/+2
2011-01-06On Windows, convert all of our command-line arguments from UTF-16 toGerald Combs1-0/+21
2010-05-28Move some code (including the optional objects) into libwsutilJeff Morriss1-1/+1
2009-10-06Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_HStig Bjørlykke1-4/+4
2009-10-05Fixed a int/long warning.Stig Bjørlykke1-3/+3
2009-07-22Use "svn info" to fetch the version by default. Fetch the repository path asGerald Combs1-1/+1
2009-05-12Minor cleanup of "-h" output text.Bill Meier1-12/+12
2008-05-22Move the file utility functions from wiretap to libwsutil so thatJeff Morriss1-5/+5
2008-01-24Fixed some malloc -> g_malloc, free -> g_free, strdup -> g_strdup.Stig Bjørlykke1-2/+2
2006-05-28Ethereal->WiresharkAnders Broman1-1/+1
2006-03-30From Martin Mathieson:Anders Broman1-2/+2
2006-01-10same command line related changes as recently done with editcapUlf Lamping1-33/+62
2005-11-06replace *a lot* of file related calls by their GLib counterparts. This is nec...Ulf Lamping1-10/+2
2005-09-14added compression support for capture file output. The Save/As dialog now has...Ulf Lamping1-1/+1
2004-12-29Make the tone of the error messages a bit less formal, by usingGuy Harris1-3/+3
2004-10-29The common merge code merely needs to offer the abstraction of routinesGuy Harris1-33/+59
2004-10-28Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris1-12/+40
2004-10-28Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris1-14/+67
2004-10-27Change some of the merge.c APIs to return more information on failure,Guy Harris1-31/+78
2004-10-27Check whether any input files were specified, and print an error forGuy Harris1-0/+4
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
2004-07-15Convert make-version.pl and the associated cvsversion.h and CVSVERSIONGerald Combs1-3/+3
2004-07-13If we fail to open the output file, report the reason why.Guy Harris1-5/+7
2004-07-12bugfix to a bug reported by jprakashbabu@hotpop.com:Ulf Lamping1-6/+6
2004-06-30Initialize "out_filename" to NULL, so it's set to NULL if it's not setGuy Harris1-3/+3
2004-06-30On at least some platforms, a #define of O_BINARY is needed even ifGuy Harris1-1/+5
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-4/+26
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-351/+16
2004-03-04Undo an unnecessary changeJörg Mayer1-2/+2
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer1-1/+6
2004-02-20Add support for a "version.conf" file in the main directory which canGerald Combs1-2/+2
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