index
:
wireshark
daniel/osmux
fixeria/ipa
laforge/amr-2023
laforge/doc-fixes
laforge/pending
laforge/qcdiag
laforge/rspro
master
mobis
mobis_new
more-patches
osmith/deb-packaging
osmith/wip
osmocom/master
osmocom/qcdiag
pespin/amr
pespin/csn1
pespin/gsup
pespin/iuup-extended
pespin/osmux-stats
pespin/osmux-wip
pespin/racap
pespin/racap-tmp
pespin/rlcmac
sylvain/gmr
sylvain/gmr1
thomas/dect
wireshark.org protocol dissector with Osmocom additions (obsolete)
Harald Welte
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
wiretap
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2016-02-25
Clean up modelines and indentation.
Guy Harris
1
-3
/
+3
2016-02-23
Making wiretap option blocks more generic.
Michael Mann
1
-85
/
+116
2016-02-11
Make file indices consistently unsigned in the merge code.
Guy Harris
1
-6
/
+6
2016-02-11
Avoid undefined behavior in overflow check
Michael McConville
1
-1
/
+1
2015-11-23
merge: fix parameter 'in_files/in_count_files' not found in the function decl...
Alexis La Goutte
1
-6
/
+6
2015-11-11
Make routines used only within wiretap/merge.c static.
Guy Harris
1
-43
/
+46
2015-11-10
Fix typo.
Guy Harris
1
-1
/
+1
2015-10-05
Allow use of variadic macros
Peter Wu
1
-34
/
+28
2015-08-21
Fix memory leaks of dumper SHB and IDB infos
Hadriel Kaplan
1
-5
/
+15
2015-08-19
Pcap: wtap does not set interface timestamp precision when reading pcap
Hadriel Kaplan
1
-1
/
+1
2015-08-19
Add more debug infor for windows buildbot test suite failure
Hadriel Kaplan
1
-0
/
+27
2015-08-19
Try to debug merge test suite failure on windows buildbot
Hadriel Kaplan
1
-0
/
+30
2015-08-18
Improve file merging for mergecap and wireshark
Hadriel Kaplan
1
-6
/
+704
2015-08-14
Ident the merge.c/h files by 4 spaces
Hadriel Kaplan
1
-141
/
+141
2015-02-28
Remove some unneeded includes of <sys/time.h>.
Guy Harris
1
-4
/
+0
2015-01-03
Remove unnecessary includes from wiretap folder
Martin Mathieson
1
-2
/
+0
2015-01-02
Add "Editor modelines"; Adjust whitespace as needed.
Bill Meier
1
-0
/
+13
2014-09-22
Try to fix some buildbot warnings
Michal Labedzki
1
-2
/
+3
2014-05-09
Revert "Refactor Wiretap"
Guy Harris
1
-14
/
+13
2014-05-09
Refactor Wiretap
Michael Mann
1
-13
/
+14
2014-03-04
Remove all $Id$ from top of file
Alexis La Goutte
1
-2
/
+0
2014-02-25
Wireshark: Add option to choose format type of capture file
Michal Labedzki
1
-1
/
+1
2013-11-09
Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.
Jakub Zawadzki
1
-2
/
+3
2013-07-16
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
Jeff Morriss
1
-0
/
+286