From 6011a047d3cd2aba84e7fdd3bf7e8403a2f3563b Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 17 Dec 2014 16:41:21 -0800 Subject: WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading. Check for them *only* on opening for writing and writes. Change-Id: I4b537d511ec04bcfc81f69166a2b9a2ee9310067 Reviewed-on: https://code.wireshark.org/review/5827 Reviewed-by: Guy Harris --- mergecap.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index cdf2cbe1bc..82b26403e7 100644 --- a/mergecap.c +++ b/mergecap.c @@ -377,9 +377,7 @@ main(int argc, char *argv[]) switch (open_err) { case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_UNWRITABLE_ENCAP: case WTAP_ERR_BAD_FILE: - case WTAP_ERR_UNWRITABLE_REC_DATA: fprintf(stderr, "(%s)\n", err_info); g_free(err_info); break; @@ -547,9 +545,7 @@ main(int argc, char *argv[]) switch (read_err) { case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_UNWRITABLE_ENCAP: case WTAP_ERR_BAD_FILE: - case WTAP_ERR_UNWRITABLE_REC_DATA: fprintf(stderr, "(%s)\n", err_info); g_free(err_info); break; -- cgit v1.2.1