Wireshark-commits: [Wireshark-commits] rev 42854: /trunk/ /trunk/: merge.c
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: guy@xxxxxxxxxxxxx
Date: Fri, 25 May 2012 18:50:47 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=42854

User: guy
Date: 2012/05/25 11:50 AM

Log:
 On a read error, always return a pointer to the merge_in_file_t for the
 file from which we got the error.
 
 On a successful read, always clear out err - wtap_read() doesn't set *err
 on success.

Directory: /trunk/
  Changes    Path          Action
  +10 -3     merge.c       Modified