diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-17 16:02:50 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-18 00:03:26 +0000 |
| commit | 51522b33723dec4dd0481dcabc261010be39937c (patch) | |
| tree | 4c772ba5dd3a61a470784464e39573ca27c5028c /editcap.c | |
| parent | 8ce0f122011f26ab4e81172e9899ed27a5508abd (diff) | |
| download | wireshark-51522b33723dec4dd0481dcabc261010be39937c.tar.gz | |
Handle "I can't map this for that file format" better.
For cases where record (meta)data is something that can't be written out
in a particular file format, return WTAP_ERR_UNWRITABLE_REC_DATA along
with an err_info string.
Report (and free) that err_info string in cases where
WTAP_ERR_UNWRITABLE_REC_DATA is returned.
Clean up some other error reporting cases, and flag with an XXX some
cases where we aren't reporting errors at all, while we're at it.
Change-Id: I91d02093af0d42c24ec4634c2c773b30f3d39ab3
Reviewed-on: https://code.wireshark.org/review/5823
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'editcap.c')
| -rw-r--r-- | editcap.c | 36 |
1 files changed, 33 insertions, 3 deletions
@@ -1253,6 +1253,7 @@ main(int argc, char *argv[]) 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; @@ -1638,7 +1639,7 @@ main(int argc, char *argv[]) } } - if (!wtap_dump(pdh, phdr, buf, &err)) { + if (!wtap_dump(pdh, phdr, buf, &err, &err_info)) { switch (err) { case WTAP_ERR_UNWRITABLE_ENCAP: /* @@ -1648,7 +1649,7 @@ main(int argc, char *argv[]) * and file type/subtype. */ fprintf(stderr, - "editcap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file\n.", + "editcap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n", read_count, argv[optind], wtap_file_type_subtype_string(out_file_type_subtype)); break; @@ -1661,11 +1662,39 @@ main(int argc, char *argv[]) * and file type/subtype. */ fprintf(stderr, - "editcap: Frame %u of \"%s\" is too large for a \"%s\" file\n.", + "editcap: Frame %u of \"%s\" is too large for a \"%s\" file.\n", read_count, argv[optind], wtap_file_type_subtype_string(out_file_type_subtype)); break; + case WTAP_ERR_REC_TYPE_UNSUPPORTED: + /* + * This is a problem with the particular record we're + * writing and the file type and subtype we're + * writing; note that, and report the record number + * and file type/subtype. + */ + fprintf(stderr, + "editcap: Record %u of \"%s\" has a record type that can't be saved in a \"%s\" file.\n", + read_count, argv[optind], + wtap_file_type_subtype_string(out_file_type_subtype)); + break; + + case WTAP_ERR_UNWRITABLE_REC_DATA: + /* + * This is a problem with the particular record we're + * writing and the file type and subtype we're + * writing; note that, and report the record number + * and file type/subtype. + */ + fprintf(stderr, + "editcap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n", + read_count, argv[optind], + wtap_file_type_subtype_string(out_file_type_subtype), + err_info); + g_free(err_info); + break; + default: fprintf(stderr, "editcap: Error writing to %s: %s\n", filename, wtap_strerror(err)); @@ -1691,6 +1720,7 @@ main(int argc, char *argv[]) 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; |