index
:
tools/wireshark
Novell_NCP_branch
cherry-pick-112af30d
cherry-pick-78067deb-2
cherry-pick-c6e60da6-2
ethereal
lts-1.12.1
lts-1.2.11
lts-1.8.2
master
master-1.0
master-1.10
master-1.12
master-1.2
master-1.4
master-1.6
master-1.8
master-2.0
master-2.2
master-2.4
master-2.6
master-3.0
master-3.2
old-trunk-1.0
release-3.4
release-3.6
win32-native
WIP Patches to add a samsung-ipc dissector to Wireshark
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
mergecap.c
Commit message (
Expand
)
Author
Age
Files
Lines
*
Free the error info string after using it.
Guy Harris
2004-01-25
1
-1
/
+2
*
Have the Wiretap open, read, and seek-and-read routines return, in
Guy Harris
2004-01-25
1
-6
/
+27
*
Fix warnings found by -Wstrict-prototypes
Jörg Mayer
2004-01-18
1
-2
/
+2
*
Output the result of -h to stdout, not stderr
Jörg Mayer
2004-01-18
1
-18
/
+18
*
Nice rendering of the CVS version as "(cvs 200401181200003000)".
Olivier Biot
2004-01-18
1
-2
/
+6
*
In case of CVS sources, add the date of the last change to the version
Jörg Mayer
2004-01-16
1
-2
/
+3
*
Removed trailing whitespaces from .h and .c files using the
Jörg Mayer
2002-08-28
1
-19
/
+19
*
Replace the types from sys/types.h and netinet/in.h by their glib.h
Jörg Mayer
2002-08-02
1
-9
/
+5
*
WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3's
Guy Harris
2002-06-23
1
-3
/
+3
*
From Joerg Mayer: mark function arguments as unused.
Guy Harris
2002-03-31
1
-2
/
+2
*
From Peter Valchev: fix editcap to assign the result of "getopt()" to an
Guy Harris
2002-02-24
1
-2
/
+2
*
Have Wiretap set the snapshot length to 0 if it can't be derived from
Guy Harris
2002-02-08
1
-3
/
+9
*
Use longs as file offsets, so that on platforms with 64-bit "long" we
Guy Harris
2001-10-04
1
-3
/
+3
*
Get rid of some unused variables.
Guy Harris
2001-07-20
1
-4
/
+1
*
From Scott Renfro: correctly handle merging multiple files with
Guy Harris
2001-07-14
1
-7
/
+53
*
Update from Scott Renfro to allow mergecap to merge multiple capture
Guy Harris
2001-07-13
1
-140
/
+265
*
Mergecap utility for merging capture files, from Scott Renfro.
Guy Harris
2001-07-12
1
-0
/
+330