diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-16 22:40:45 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-17 06:41:45 +0000 |
| commit | dbdcae80ba93961f66274f37178d745557786525 (patch) | |
| tree | e69243804282a6a2b448c2b49dbc0f05b499927c /mergecap.c | |
| parent | 40f69b2778cb6a9add18cfeacbca430284b1cd66 (diff) | |
| download | wireshark-dbdcae80ba93961f66274f37178d745557786525.tar.gz | |
Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP.
That makes it clearer what the problem is, and that it should only be
returned by the dump code path, not by the read code path.
Change-Id: Icc5c9cff43be6c073f0467607555fa7138c5d074
Reviewed-on: https://code.wireshark.org/review/5797
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mergecap.c b/mergecap.c index 31d7c5efda..b85f1f04e8 100644 --- a/mergecap.c +++ b/mergecap.c @@ -377,7 +377,7 @@ main(int argc, char *argv[]) switch (open_err) { case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_UNSUPPORTED_ENCAP: + case WTAP_ERR_UNWRITABLE_ENCAP: case WTAP_ERR_BAD_FILE: fprintf(stderr, "(%s)\n", err_info); g_free(err_info); @@ -546,7 +546,7 @@ main(int argc, char *argv[]) switch (read_err) { case WTAP_ERR_UNSUPPORTED: - case WTAP_ERR_UNSUPPORTED_ENCAP: + case WTAP_ERR_UNWRITABLE_ENCAP: case WTAP_ERR_BAD_FILE: fprintf(stderr, "(%s)\n", err_info); g_free(err_info); @@ -559,7 +559,7 @@ main(int argc, char *argv[]) if (got_write_error) { switch (write_err) { - case WTAP_ERR_UNSUPPORTED_ENCAP: + case WTAP_ERR_UNWRITABLE_ENCAP: /* * This is a problem with the particular frame we're writing and * the file type and subtype we're wwriting; note that, and |