https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416
--- Comment #17 from Michael Mann <mmann78@xxxxxxxxxxxx> 2011-10-25 19:07:17 PDT ---
(In reply to comment #15)
> Hmmm, unfortunately the new patch doesn't apply cleanly:
> ~~~
> (Stripping trailing CRs from patch.)
> patching file epan/dissectors/packet-cip.c
> Hunk #1 succeeded at 14 with fuzz 1.
> Hunk #11 FAILED at 2495.
> Hunk #13 FAILED at 2681.
> Hunk #20 FAILED at 3095.
> Hunk #21 FAILED at 3104.
> Hunk #38 FAILED at 3982.
> Hunk #39 FAILED at 3997.
> Hunk #50 FAILED at 4372.
> Hunk #52 FAILED at 4460.
> 8 out of 63 hunks FAILED -- saving rejects to file
> epan/dissectors/packet-cip.c.rej
> (Stripping trailing CRs from patch.)
> patching file epan/dissectors/packet-cip.h
> (Stripping trailing CRs from patch.)
> patching file epan/dissectors/packet-cipmotion.c
> (Stripping trailing CRs from patch.)
> patching file epan/dissectors/packet-enip.c
> Hunk #1 FAILED at 10.
> 1 out of 20 hunks FAILED -- saving rejects to file
> epan/dissectors/packet-enip.c.rej
> (Stripping trailing CRs from patch.)
> patching file epan/dissectors/packet-enip.h
> ~~~
Any hints on how to fix this? Merging through the fix-encoding-args.pl changes
was difficult (and I'm still learning the tools), but I thought the provided
patch was diffed from the latest trunk, so I don't understand how this could
happen.
--
Configure bugmail: https://bugs.wireshark.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching all bug changes.
