| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
svn path=/trunk/; revision=12427
|
| |
|
|
|
|
|
|
|
|
| |
indication - success, read failure, write failure - and have their
callers handle read failures by looking for the file that got the read
failure and reporting the failure in question.
Free up the err_info string returned by "wtap_read()" after using it.
svn path=/trunk/; revision=12423
|
| |
|
|
|
|
|
|
|
|
|
|
| |
mergecap.c (get rid of the verbose printing of information for each
packet).
Have "merge_append_files()" return FALSE only on a write error, as
"merge_files()" does.
Sort the routines in "merge.c" in the order from "merge.h".
svn path=/trunk/; revision=12422
|
| |
|
|
|
|
| |
absorbing its logic into "cf_merge_files()" simplifies things a bit.
svn path=/trunk/; revision=12421
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
and use that information to provide better error messages.
Have "merge_open_outfile()" do all the work of filling in the
merge_out_file_t structure, with the values to use passed as arguments.
Get rid of some structure members that used to be used solely to pass
information to "merge_open_outfile()".
Add a "cf_merge_files()" routine to do the merging and reporting of errors.
svn path=/trunk/; revision=12420
|
| |
|
|
|
|
| |
specified in the GUI.
svn path=/trunk/; revision=12326
|
| |
|
|
|
|
|
|
|
| |
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.
svn path=/trunk/; revision=11400
|
| |
|
|
|
|
|
| |
instead of giving the merge stuff a filename,
give it an already opened file descriptor
svn path=/trunk/; revision=11273
|
| |
|
|
|
|
|
| |
merge them together into a new temporary file
(and notice the user by a simple_dialog about it)
svn path=/trunk/; revision=11205
|
| |
|
|
|
|
|
| |
- It's gboolean not boolean
Fix warning about extraneous , at end of enum.
svn path=/trunk/; revision=11177
|
|
|
and doing some more code cleanup
svn path=/trunk/; revision=11176
|
