summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capture_info.c2
-rw-r--r--epan/wslua/wslua_dumper.c4
-rw-r--r--file.c2
-rw-r--r--tshark.c4
-rw-r--r--wiretap/btsnoop.c4
-rw-r--r--wiretap/erf.c2
-rw-r--r--wiretap/file_access.c2
-rw-r--r--wiretap/libpcap.c4
-rw-r--r--wiretap/logcat.c2
-rw-r--r--wiretap/logcat_text.c2
-rw-r--r--wiretap/netmon.c6
-rw-r--r--wiretap/netscaler.c8
-rw-r--r--wiretap/wtap.c2
-rw-r--r--wiretap/wtap.h2
14 files changed, 23 insertions, 23 deletions
diff --git a/capture_info.c b/capture_info.c
index ff04e2d417..805b49f71e 100644
--- a/capture_info.c
+++ b/capture_info.c
@@ -138,7 +138,7 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
errmsg = errmsg_errno;
break;
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
/* Seen only when opening a capture file for writing. */
errmsg = "TShark doesn't support writing capture files in that format.";
break;
diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c
index 226fab83b0..1c59c5d8f9 100644
--- a/epan/wslua/wslua_dumper.c
+++ b/epan/wslua/wslua_dumper.c
@@ -223,7 +223,7 @@ WSLUA_CONSTRUCTOR Dumper_new(lua_State* L) {
if (! d ) {
/* WSLUA_ERROR("Error while opening file for writing"); */
switch (err) {
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
luaL_error(L,"Files of file type %s cannot be written",
wtap_file_type_subtype_string(filetype));
break;
@@ -367,7 +367,7 @@ WSLUA_METHOD Dumper_new_for_current(lua_State* L) {
if (! d ) {
switch (err) {
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
luaL_error(L,"Files of file type %s cannot be written",
wtap_file_type_subtype_string(filetype));
break;
diff --git a/file.c b/file.c
index 3c47bbd1cc..bfe7f71451 100644
--- a/file.c
+++ b/file.c
@@ -5020,7 +5020,7 @@ cf_open_failure_alert_box(const char *filename, int err, gchar *err_info,
display_basename, wtap_file_type_subtype_string(file_type));
break;
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
/* Seen only when opening a capture file for writing. */
simple_error_message_box(
"Wireshark doesn't support writing capture files in that format.");
diff --git a/tshark.c b/tshark.c
index ed2b480abd..36eea4b65b 100644
--- a/tshark.c
+++ b/tshark.c
@@ -3116,7 +3116,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
/* We couldn't set up to write to the capture file. */
switch (err) {
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
cmdarg_err("Capture files can't be written in that format.");
break;
@@ -4160,7 +4160,7 @@ cf_open_error_message(int err, gchar *err_info, gboolean for_writing,
errmsg = errmsg_errno;
break;
- case WTAP_ERR_UNSUPPORTED_FILE_TYPE:
+ case WTAP_ERR_UNWRITABLE_FILE_TYPE:
/* Seen only when opening a capture file for writing. */
errmsg = "TShark doesn't support writing capture files in that format.";
break;
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index e0f266ba41..af10c3c86d 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -409,7 +409,7 @@ gboolean btsnoop_dump_open_h1(wtap_dumper *wdh, int *err)
default:
/* We should never get here - our open routine
should only get called for the types above. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
@@ -451,7 +451,7 @@ gboolean btsnoop_dump_open_h4(wtap_dumper *wdh, int *err)
default:
/* We should never get here - our open routine
should only get called for the types above. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 2398d15912..b6a984a82e 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -730,7 +730,7 @@ int erf_dump_open(wtap_dumper *wdh, int *err)
wdh->tsprecision = WTAP_TSPREC_NSEC;
break;
default:
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
break;
}
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 03177c7407..018045cf61 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -2225,7 +2225,7 @@ wtap_dump_open_check(int file_type_subtype, int encap, gboolean compressed, int
{
if (!wtap_dump_can_open(file_type_subtype)) {
/* Invalid type, or type we don't know how to write. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 2a770a594c..c6141cd1db 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -851,7 +851,7 @@ gboolean libpcap_dump_open(wtap_dumper *wdh, int *err)
default:
/* We should never get here - our open routine
should only get called for the types above. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
@@ -982,7 +982,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh,
/* We should never get here - our open routine
should only get called for the types above. */
g_assert_not_reached();
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index b1ab83dbe4..a10cc7544e 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -353,7 +353,7 @@ gboolean logcat_binary_dump_open(wtap_dumper *wdh, int *err)
break;
default:
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index a0da65616e..96ec2cb656 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -532,7 +532,7 @@ static gboolean logcat_text_dump_text(wtap_dumper *wdh,
return FALSE;
}
} else {
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
}
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 7d0592890e..e9f50ce204 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1038,7 +1038,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
default:
/* We should never get here - our open routine
should only get called for the types above. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
@@ -1143,7 +1143,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
default:
/* We should never get here - our open routine
should only get called for the types above. */
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
@@ -1296,7 +1296,7 @@ static gboolean netmon_dump_close(wtap_dumper *wdh, int *err)
/* We should never get here - our open routine
should only get called for the types above. */
if (err != NULL)
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
if (!wtap_dump_file_write(wdh, magicp, magic_size, err))
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index f8764ab43c..7d3fb9da6b 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -1845,7 +1845,7 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
nstrace->page_offset += (guint16) phdr->caplen;
} else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
{
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
}
@@ -1860,7 +1860,7 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
case NSPR_HEADER_VERSION206:
if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
{
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
} else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
{
@@ -1889,11 +1889,11 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
case NSPR_HEADER_VERSION300:
if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
{
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
} else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
{
- *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+ *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
return FALSE;
} else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0)
{
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 6ce8f38dda..74cab0901c 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -831,7 +831,7 @@ static const char *wtap_errlist[] = {
/* WTAP_ERR_CANT_OPEN */
NULL,
- /* WTAP_ERR_UNSUPPORTED_FILE_TYPE */
+ /* WTAP_ERR_UNWRITABLE_FILE_TYPE */
"Files can't be saved in that format",
/* WTAP_ERR_UNWRITABLE_ENCAP */
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 2590bb35e9..e7d80da355 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1681,7 +1681,7 @@ int wtap_register_encap_type(const char* name, const char* short_name);
#define WTAP_ERR_CANT_OPEN -6
/** The file couldn't be opened, reason unknown */
-#define WTAP_ERR_UNSUPPORTED_FILE_TYPE -7
+#define WTAP_ERR_UNWRITABLE_FILE_TYPE -7
/** Wiretap can't save files in the specified format */
#define WTAP_ERR_UNWRITABLE_ENCAP -8
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-21 22:24:28 +0000