Wireshark · Wireshark-commits: [Wireshark-commits] rev 39964: /trunk/ /trunk/: file.c merge.c mergecap.c

[guy@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=39964

User: guy
Date: 2011/11/20 10:26 PM

Log:
 On an I/O error, merge_read_packet() and merge_append_read_packet() need
 to return a pointer to the merge_in_file_t that got the error.  Set *err
 to 0 on success and an error code on an err, treat a null return as an
 EOF indication, and if we don't get a null return check for a non-zero
 error code and treat that as an I/O error.

Directory: /trunk/
  Changes    Path          Action
  +7 -2      file.c        Modified
  +22 -7     merge.c       Modified
  +7 -2      mergecap.c    Modified