The common merge code merely needs to offer the abstraction of routines
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 29 Oct 2004 00:36:52 +0000 (00:36 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 29 Oct 2004 00:36:52 +0000 (00:36 +0000)
commite0f9d3672613db3dda3f7a32afc9cd8ae9d2b895
treec12d542a15efb8683f2228ca69aff9142672b6a7
parentfe34244ca00adb9d770ee54457fcc11048265598
The common merge code merely needs to offer the abstraction of routines
that return the next packet from a set of {chronologically sorted,
sequential-by-file} packets; it doesn't need to have a loop over all
those packets, or any code to write packets.

Supply those abstractions, change the code that merges packets to do its
own writing, and have the Ethereal version manage a progress bar and
have the mergecap version print packet numbers in verbose mode, as the
common merge code used to do.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12427 f5534014-38df-0310-8fa8-9805f1628bb7
file.c
merge.c
merge.h
mergecap.c