aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
Commit message (Expand)AuthorAgeFilesLines
* To see whether a string equals another string, just use strcmp().Guy Harris2016-03-061-1/+1
* We need to include <wsutil/privileges.h> for those functions.Guy Harris2016-03-031-0/+1
* Add missing initialization calls.Guy Harris2016-03-031-1/+8
* Refactor wiretap option block types into a registration system.Michael Mann2016-03-031-0/+43
* Clean up more includes of wtap.h.Guy Harris2016-01-061-1/+2
* Remove -Wwrite-strings compiler flagJoão Valverde2015-12-121-4/+2
* Update user guide for development releasePascal Quantin2015-11-111-1/+1
* Clean up includes of unistd.h, fcntl.h, and sys/stat.h.Guy Harris2015-11-071-8/+0
* Improve file merging for mergecap and wiresharkHadriel Kaplan2015-08-181-336/+127
* Pcapng: support Name Resolution Block optionsHadriel Kaplan2015-08-061-1/+1
* mergecap: check input files time precision before exporting to pcapng formatPascal Quantin2015-06-251-2/+39
* mergecap: fix merge of files with different encapsulation typesPascal Quantin2015-05-101-1/+52
* Remove some unneeded includes of <sys/time.h>.Guy Harris2015-02-281-4/+0
* Suppress a bunch of cast-qual warnings.Gerald Combs2015-02-201-2/+5
* (Trivial) Fix printf-related 'Mismatch on sign' warningsBill Meier2015-02-091-1/+1
* Do the full string in get_{compiled,runtime}_version_info().Guy Harris2014-12-311-6/+4
* Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris2014-12-311-2/+0
* Only include <wsutil/os_version_info.h> if we need it.Guy Harris2014-12-251-1/+0
* Check for getopt_long(), not getopt().Guy Harris2014-12-251-1/+1
* Move twelve show_version() functions from the varoius programs andStephen Fisher2014-12-241-16/+1
* Fix The left operand of '!=' is a garbage value issue found by Clang AnalyzerAlexis La Goutte2014-12-221-1/+1
* Make sure err_info is always set, and print it iff it's non-null.Guy Harris2014-12-181-11/+3
* WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading.Guy Harris2014-12-181-4/+0
* Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE.Guy Harris2014-12-181-1/+1
* Handle "I can't map this for that file format" better.Guy Harris2014-12-181-3/+29
* Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP.Guy Harris2014-12-171-3/+3
* Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines.Guy Harris2014-10-291-2/+2
* Ensure pcapng application name is always dynamically allocatedEvan Huus2014-09-221-1/+1
* Modify includes of config.h so that out-of-tree builds, i.e. CMakeGraham Bloice2014-08-241-1/+1
* Fix whitespace/indentation to match editor modelines.Bill Meier2014-08-051-1/+1
* 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