path: root/merge.c
AgeCommit message (Collapse)AuthorFilesLines
2005-08-24EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! Ulf Lamping1-5/+5
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
2005-08-19Add APIs to Wiretap to return the file of the size as supplied by the OSGuy Harris1-8/+4
(so if the file's gzipped, it's *NOT* the size of the file after uncompressing), and an approximation of the amount of that data read sequentially so far. Use those for various progress bars and the like. Make the fstat() in the Ascend trace reader directly use wth->fd, as it's inside Wiretap; that gets rid of the last caller of wtap_fd() (as we're no longer directly using fstat() or lseek() in Ethereal), so get rid of wtap_fd(). svn path=/trunk/; revision=15437
2004-10-29The common merge code merely needs to offer the abstraction of routinesGuy Harris1-137/+85
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
2004-10-28Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris1-19/+17
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
2004-10-28Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris1-231/+147
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
2004-10-27Get rid of merge_n_files() - it's only called in one place now, andGuy Harris1-49/+0
absorbing its logic into "cf_merge_files()" simplifies things a bit. svn path=/trunk/; revision=12421
2004-10-27Change some of the merge.c APIs to return more information on failure,Guy Harris1-44/+51
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
2004-10-27Fix indentation.Guy Harris1-9/+9
svn path=/trunk/; revision=12411
2004-10-17From Mark C. Brown: allow the file type for the merge operation to beGuy Harris1-2/+2
specified in the GUI. svn path=/trunk/; revision=12326
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
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
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-15/+11
instead of giving the merge stuff a filename, give it an already opened file descriptor svn path=/trunk/; revision=11273
2004-06-21if more than one file is (drag and) dropped into the program,Ulf Lamping1-12/+2
merge them together into a new temporary file (and notice the user by a simple_dialog about it) svn path=/trunk/; revision=11205
2004-06-18Fix compile errors on Suse 9.1:Jörg Mayer1-2/+2
- It's gboolean not boolean Fix warning about extraneous , at end of enum. svn path=/trunk/; revision=11177
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-99/+80
and doing some more code cleanup svn path=/trunk/; revision=11176
2004-06-18merge: bugfixes and code cleanupUlf Lamping1-11/+10
svn path=/trunk/; revision=11175
2004-06-17add Merge functionality to Ethereal in an experimental state.Ulf Lamping1-0/+458
Copied and sligthly modified merge.c from mergecap.c (needs a lot of code cleanup, though) svn path=/trunk/; revision=11171