aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
Commit message (Expand)AuthorAgeFilesLines
* Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss2013-07-161-8/+4
* Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specificJeff Morriss2013-07-161-1/+2
* Add strnatcmp by Martin Pool for 'natural order' string comparisons, and make...Chris Maynard2013-07-101-1/+14
* Only cast the variable after checking it.Michael Tüxen2013-03-101-3/+3
* Use explicit casts.Anders Broman2013-03-051-2/+2
* When any of our executables start on Windows create or open a "WiresharkGerald Combs2013-02-201-0/+1
* Add wtap_pseudo_header union to wtap_pkthdr structure.Jakub Zawadzki2012-10-161-2/+1
* We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss2012-09-201-2/+0
* Avoid needlessly shadowing another variable.Martin Mathieson2012-05-101-1/+0
* Fix typo.Michael Tüxen2012-04-251-1/+1
* Fix copy and paste error.Michael Tüxen2012-04-251-1/+1
* Fix compilation. While there, remove some trailing whitespaces.Michael Tüxen2012-04-251-2/+2
* use in_files->filenameAnders Broman2012-04-251-1/+1
* Add some info in SHB if writing a pcap-ng file.Anders Broman2012-04-251-1/+24
* From Michael Mann:Anders Broman2012-01-231-1/+1
* Alphabetize the list of encapsulation types via "mergecap -T" as well as the ...Chris Maynard2011-12-221-14/+51
* Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports anyGuy Harris2011-12-131-2/+2
* Hopefully clarify usage a bit to indicate multiple infile's can be specified ...Chris Maynard2011-11-301-2/+20
* From Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes ...Chris Maynard2011-11-301-1/+1
* On an I/O error, merge_read_packet() and merge_append_read_packet() needGuy Harris2011-11-211-2/+7
* When reporting "sorry, *this* packet can't be written to a file of thatGuy Harris2011-11-191-12/+25
* Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5608 :Jeff Morriss2011-08-091-3/+1
* Replace all strerror() with g_strerror().Stig Bjørlykke2011-06-281-1/+1
* Have mergecap, tshark, and editcap write pcap-ng files by default. ThisGerald Combs2011-06-201-1/+5
* Move the Windows argument list conversion code to a common routine.Gerald Combs2011-05-241-14/+2
* On Windows, convert all of our command-line arguments from UTF-16 toGerald Combs2011-01-061-0/+21
* Move some code (including the optional objects) into libwsutilJeff Morriss2010-05-281-1/+1
* Invert check for getopt: NEED_GETOPT_H -> HAVE_GETOPT_HStig Bjørlykke2009-10-061-4/+4
* Fixed a int/long warning.Stig Bjørlykke2009-10-051-3/+3
* Use "svn info" to fetch the version by default. Fetch the repository path asGerald Combs2009-07-221-1/+1
* Minor cleanup of "-h" output text.Bill Meier2009-05-121-12/+12
* Move the file utility functions from wiretap to libwsutil so thatJeff Morriss2008-05-221-5/+5
* Fixed some malloc -> g_malloc, free -> g_free, strdup -> g_strdup.Stig Bjørlykke2008-01-241-2/+2
* Ethereal->WiresharkAnders Broman2006-05-281-1/+1
* From Martin Mathieson:Anders Broman2006-03-301-2/+2
* same command line related changes as recently done with editcapUlf Lamping2006-01-101-33/+62
* replace *a lot* of file related calls by their GLib counterparts. This is nec...Ulf Lamping2005-11-061-10/+2
* added compression support for capture file output. The Save/As dialog now has...Ulf Lamping2005-09-141-1/+1
* Make the tone of the error messages a bit less formal, by usingGuy Harris2004-12-291-3/+3
* The common merge code merely needs to offer the abstraction of routinesGuy Harris2004-10-291-33/+59
* Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris2004-10-281-12/+40
* Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris2004-10-281-14/+67
* Change some of the merge.c APIs to return more information on failure,Guy Harris2004-10-271-31/+78
* Check whether any input files were specified, and print an error forGuy Harris2004-10-271-0/+4
* Set the svn:eol-style property on all text files to "native", so thatGuy Harris2004-07-181-1/+1
* Convert make-version.pl and the associated cvsversion.h and CVSVERSIONGerald Combs2004-07-151-3/+3
* If we fail to open the output file, report the reason why.Guy Harris2004-07-131-5/+7
* bugfix to a bug reported by jprakashbabu@hotpop.com:Ulf Lamping2004-07-121-6/+6
* Initialize "out_filename" to NULL, so it's set to NULL if it's not setGuy Harris2004-06-301-3/+3
* On at least some platforms, a #define of O_BINARY is needed even ifGuy Harris2004-06-301-1/+5