Ethereal-cvs: [Ethereal-cvs] Rev 12420: /trunk/gtk/: file_dlg.c main.c /trunk/: file.c file.h

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date: Wed, 27 Oct 2004 23:28:42 -0000
User: guy
Date: 2004/10/27 06:28 PM

Log:
 Change some of the merge.c APIs to return more information on failure,
 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.

Directory: /trunk/gtk/
  Changes    Path          Action
  +11 -12    file_dlg.c    Modified
  +32 -34    main.c        Modified

Directory: /trunk/
  Changes    Path          Action
  +35 -0     file.c        Modified
  +4 -0      file.h        Modified
  +51 -44    merge.c       Modified
  +34 -17    merge.h       Modified
  +78 -31    mergecap.c    Modified



http://anonsvn.ethereal.com/viewcvs/viewcvs.py?rev=12420&view=rev