aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capinfos.c4
-rw-r--r--capture_info.c11
-rw-r--r--captype.c2
-rw-r--r--editcap.c4
-rw-r--r--file.c38
-rw-r--r--frame_tvbuff.c2
-rw-r--r--mergecap.c4
-rw-r--r--rawshark.c6
-rw-r--r--reordercap.c6
-rw-r--r--tshark.c20
10 files changed, 9 insertions, 88 deletions
diff --git a/capinfos.c b/capinfos.c
index 7c98f33b6d..785818741d 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -905,10 +905,8 @@ process_cap_file(wtap *wth, const char *filename)
break;
case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNWRITABLE_ENCAP:
case WTAP_ERR_BAD_FILE:
case WTAP_ERR_DECOMPRESS:
- case WTAP_ERR_UNWRITABLE_REC_DATA:
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
/* fallthrough */
@@ -1486,10 +1484,8 @@ main(int argc, char *argv[])
switch (err) {
case WTAP_ERR_UNSUPPORTED:
- case WTAP_ERR_UNWRITABLE_ENCAP:
case WTAP_ERR_BAD_FILE:
case WTAP_ERR_DECOMPRESS:
- case WTAP_ERR_UNWRITABLE_REC_DATA:
fprintf(stderr, "(%s)\n", err_info);
g_free(err_info);
break;
diff --git a/capture_info.c b/capture_info.c
index 6f45f5489c..753bba0e80 100644
--- a/capture_info.c
+++ b/capture_info.c
@@ -144,15 +144,8 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
break;
case WTAP_ERR_UNWRITABLE_ENCAP:
- if (for_writing)
- errmsg = "Wireshark can't save this capture in that format.";
- else {
- g_snprintf(errmsg_errno, sizeof(errmsg_errno),
- "The file \"%%s\" is a capture for a network type that Wireshark doesn't support.\n"
- "(%s)", err_info);
- g_free(err_info);
- errmsg = errmsg_errno;
- }
+ /* Seen only when opening a capture file for writing. */
+ errmsg = "Wireshark can't save this capture in that format.";
break;
case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
diff --git a/captype.c b/captype.c
index 17d21e8053..e06236130e 100644
--- a/captype.c
+++ b/captype.c
@@ -257,9 +257,7 @@ main(int argc, char *argv[])
switch (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;
diff --git a/editcap.c b/editcap.c
index 04db36f674..91ed791b95 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1251,9 +1251,7 @@ main(int argc, char *argv[])
wtap_strerror(err));
switch (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;
@@ -1718,9 +1716,7 @@ main(int argc, char *argv[])
argv[optind], wtap_strerror(err));
switch (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;
diff --git a/file.c b/file.c
index 597d19942a..757997cb82 100644
--- a/file.c
+++ b/file.c
@@ -747,13 +747,6 @@ cf_read(capture_file *cf, gboolean reloading)
g_free(err_info);
break;
- case WTAP_ERR_UNWRITABLE_ENCAP:
- simple_error_message_box(
- "The capture file has a packet with a network type that Wireshark doesn't support.\n(%s)",
- err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_SHORT_READ:
simple_error_message_box(
"The capture file appears to have been cut short"
@@ -1526,13 +1519,6 @@ cf_merge_files(char **out_filenamep, int in_file_count,
display_basename = g_filename_display_basename(in_files[i].filename);
switch (read_err) {
- case WTAP_ERR_UNWRITABLE_ENCAP:
- simple_error_message_box(
- "The capture file %s has a packet with a network type that Wireshark doesn't support.\n(%s)",
- display_basename, err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_SHORT_READ:
simple_error_message_box(
"The capture file %s appears to have been cut short"
@@ -1758,12 +1744,6 @@ cf_read_record_r(capture_file *cf, const frame_data *fdata,
display_basename = g_filename_display_basename(cf->filename);
switch (err) {
- case WTAP_ERR_UNWRITABLE_ENCAP:
- simple_error_message_box("The file \"%s\" has a packet with a network type that Wireshark doesn't support.\n(%s)",
- display_basename, err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_BAD_FILE:
simple_error_message_box("An error occurred while reading from the file \"%s\": %s.\n(%s)",
display_basename, wtap_strerror(err), err_info);
@@ -4543,13 +4523,6 @@ rescan_file(capture_file *cf, const char *fname, gboolean is_tempfile, int *err)
g_free(err_info);
break;
- case WTAP_ERR_UNWRITABLE_ENCAP:
- simple_error_message_box(
- "The capture file has a packet with a network type that Wireshark doesn't support.\n(%s)",
- err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_SHORT_READ:
simple_error_message_box(
"The capture file appears to have been cut short"
@@ -5082,15 +5055,8 @@ cf_open_failure_alert_box(const char *filename, int err, gchar *err_info,
break;
case WTAP_ERR_UNWRITABLE_ENCAP:
- if (for_writing) {
- simple_error_message_box("Wireshark can't save this capture in that format.");
- } else {
- simple_error_message_box(
- "The file \"%s\" is a capture for a network type that Wireshark doesn't support.\n"
- "(%s)",
- display_basename, err_info);
- g_free(err_info);
- }
+ /* Seen only when opening a capture file for writing. */
+ simple_error_message_box("Wireshark can't save this capture in that format.");
break;
case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED:
diff --git a/frame_tvbuff.c b/frame_tvbuff.c
index c8d2f83a68..cc02722283 100644
--- a/frame_tvbuff.c
+++ b/frame_tvbuff.c
@@ -58,8 +58,8 @@ frame_read(struct tvb_frame *frame_tvb, struct wtap_pkthdr *phdr, Buffer *buf)
* frame_tvb->tvb.length + frame_tvb->offset?
*/
if (!wtap_seek_read(frame_tvb->wth, frame_tvb->file_off, phdr, buf, &err, &err_info)) {
+ /* XXX - report error! */
switch (err) {
- case WTAP_ERR_UNWRITABLE_ENCAP:
case WTAP_ERR_BAD_FILE:
g_free(err_info);
break;
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;
diff --git a/rawshark.c b/rawshark.c
index bcd9281082..0fc46c05c4 100644
--- a/rawshark.c
+++ b/rawshark.c
@@ -1012,12 +1012,6 @@ load_cap_file(capture_file *cf)
g_free(err_info);
break;
- case WTAP_ERR_UNWRITABLE_ENCAP:
- cmdarg_err("The file \"%s\" has a packet with a network type that Rawshark doesn't support.\n(%s)",
- cf->filename, err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_SHORT_READ:
cmdarg_err("The file \"%s\" appears to have been cut short in the middle of a packet.",
cf->filename);
diff --git a/reordercap.c b/reordercap.c
index 72099cf467..b36bc58b40 100644
--- a/reordercap.c
+++ b/reordercap.c
@@ -124,9 +124,7 @@ frame_write(FrameRecord_t *frame, wtap *wth, wtap_dumper *pdh,
switch (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;
@@ -298,9 +296,7 @@ main(int argc, char *argv[])
switch (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;
@@ -356,9 +352,7 @@ main(int argc, char *argv[])
switch (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;
diff --git a/tshark.c b/tshark.c
index ef20604340..cc2cdb3d2d 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3469,12 +3469,6 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
g_free(err_info);
break;
- case WTAP_ERR_UNWRITABLE_ENCAP:
- cmdarg_err("The file \"%s\" has a packet with a network type that TShark doesn't support.\n(%s)",
- cf->filename, err_info);
- g_free(err_info);
- break;
-
case WTAP_ERR_SHORT_READ:
cmdarg_err("The file \"%s\" appears to have been cut short in the middle of a packet.",
cf->filename);
@@ -4224,16 +4218,10 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
break;
case WTAP_ERR_UNWRITABLE_ENCAP:
- if (for_writing) {
- g_snprintf(errmsg_errno, sizeof(errmsg_errno),
- "TShark can't save this capture as a \"%s\" file.",
- wtap_file_type_subtype_short_string(file_type));
- } else {
- g_snprintf(errmsg_errno, sizeof(errmsg_errno),
- "The file \"%%s\" is a capture for a network type that TShark doesn't support.\n"
- "(%s)", err_info);
- g_free(err_info);
- }
+ /* Seen only when opening a capture file for writing. */
+ g_snprintf(errmsg_errno, sizeof(errmsg_errno),
+ "TShark can't save this capture as a \"%s\" file.",
+ wtap_file_type_subtype_short_string(file_type));
errmsg = errmsg_errno;
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:37:13 +0000