URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=940e24a9ce2700025c7d2bb0dce1f4d36df9ed23
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
940e24a by Guy Harris (guy@xxxxxxxxxxxx):
Report WTAP_ERR_UNSUPPORTED correctly.
WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that
libwiretap doesn't know about (either because it's not a capture file at
all or because it's a capture file in a format it doesn't support).
WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using
features or file format elements (record type, link-layer header type,
etc.) that libwireshark doesn't support. Fix some copy-and-pasteos
causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate
for WTAP_ERR_FILE_UNKNOWN_FORMAT.
Change-Id: Ic675ffd501c52838d8944a6c61e1b01041b73098
Reviewed-on: https://code.wireshark.org/review/5799
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
(cherry picked from commit d2eddde5bd84ceb39bea77052848930c024d356b)
Reviewed-on: https://code.wireshark.org/review/5800
Actions performed:
from c3321fc Use WTAP_ERR_UNSUPPORTED for input file stuff we can't handle.
adds 940e24a Report WTAP_ERR_UNSUPPORTED correctly.
Summary of changes:
capture_info.c | 2 +-
tshark.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)