aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
Commit message (Expand)AuthorAgeFilesLines
* Use get_*_int() from wsutil, rather than defining our own.Guy Harris2014-07-031-39/+25
* Make --help and --version information a bit more uniform.Guy Harris2014-07-031-23/+73
* More getopt_long, to add --help and --version support.Guy Harris2014-07-031-1/+10
* Add command-line argument to request the version to a number of the utilities.Jeff Morriss2014-06-211-6/+17
* Revert "Refactor Wiretap"Guy Harris2014-05-091-8/+8
* Refactor WiretapMichael Mann2014-05-091-8/+8
* Remove all $Id$ from top of fileAlexis La Goutte2014-03-041-2/+0
* Fix mergecap.c: Dereference of null pointer (clang analyzer)Hadriel Kaplan2014-02-251-2/+2
* Replace "svn" with "git" all over the place.Gerald Combs2014-02-071-3/+3
* Don't write out packets that have a "captured length" bigger than we'reGuy Harris2014-01-221-4/+17
* Check the return of wtap_dump_close() even if we've gotten a read error;Guy Harris2014-01-211-3/+10
* For -h option: output to stdout and exit(0) as per convention;Bill Meier2014-01-031-45/+54
* The "file types" we have are actually combinations of types andGuy Harris2013-11-081-9/+9
* Whitespace cleanup, sort options, add modelines.Chris Maynard2013-09-061-75/+82
* 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