aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/5views.c2
-rw-r--r--wiretap/btsnoop.c2
-rw-r--r--wiretap/catapult_dct2000.c2
-rw-r--r--wiretap/commview.c4
-rw-r--r--wiretap/erf.c2
-rw-r--r--wiretap/eyesdn.c4
-rw-r--r--wiretap/k12.c2
-rw-r--r--wiretap/k12text.l4
-rw-r--r--wiretap/lanalyzer.c2
-rw-r--r--wiretap/libpcap.c2
-rw-r--r--wiretap/logcat.c2
-rw-r--r--wiretap/logcat_text.c14
-rw-r--r--wiretap/netmon.c6
-rw-r--r--wiretap/netscaler.c6
-rw-r--r--wiretap/nettl.c4
-rw-r--r--wiretap/network_instruments.c2
-rw-r--r--wiretap/netxray.c4
-rw-r--r--wiretap/ngsniffer.c2
-rw-r--r--wiretap/pcapng.c4
-rw-r--r--wiretap/snoop.c2
-rw-r--r--wiretap/visual.c2
-rw-r--r--wiretap/wtap.c2
-rw-r--r--wiretap/wtap.h2
23 files changed, 39 insertions, 39 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c
index d615a3eca4..aa5dd9afa9 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -319,7 +319,7 @@ int _5views_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap < 0 || (unsigned int) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index 2591f78d8e..e0f266ba41 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -245,7 +245,7 @@ int btsnoop_dump_can_write_encap(int encap)
/* XXX - for now we only support WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR and WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR */
if (encap != WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR && encap != WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 7b02b0e341..28c60093b0 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -575,7 +575,7 @@ catapult_dct2000_dump_can_write_encap(int encap)
default:
/* But don't write to any other formats... */
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
diff --git a/wiretap/commview.c b/wiretap/commview.c
index 0e85cbe347..c82fdbb51a 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -293,7 +293,7 @@ int commview_dump_can_write_encap(int encap)
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -392,7 +392,7 @@ static gboolean commview_dump(wtap_dumper *wdh,
break;
default :
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err = WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
diff --git a/wiretap/erf.c b/wiretap/erf.c
index fc3700e2cf..2398d15912 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -715,7 +715,7 @@ int erf_dump_can_write_encap(int encap)
return 0;
if (wtap_wtap_encap_to_erf_encap(encap) == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 4350d23644..83daf82186 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -385,7 +385,7 @@ int eyesdn_dump_can_write_encap(int encap)
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -467,7 +467,7 @@ static gboolean eyesdn_dump(wtap_dumper *wdh,
break;
default:
- *err=WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err=WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
diff --git a/wiretap/k12.c b/wiretap/k12.c
index a36fbedc96..934e8d4ec5 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -1105,7 +1105,7 @@ int k12_dump_can_write_encap(int encap) {
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap != WTAP_ENCAP_K12)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 9aed765f8d..f203fa7edb 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -399,7 +399,7 @@ k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phdr,
/*
* That encapsulation type is not supported. Fail.
*/
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err = WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
@@ -458,7 +458,7 @@ k12text_dump_can_write_encap(int encap)
case WTAP_ENCAP_MTP2:
case WTAP_ENCAP_ATM_PDUS:
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 6eaeb7f44b..bac54fa204 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -726,7 +726,7 @@ int lanalyzer_dump_can_write_encap(int encap)
if ( encap != WTAP_ENCAP_ETHERNET
&& encap != WTAP_ENCAP_TOKEN_RING )
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
/*
* printf("lanalyzer_dump_can_write_encap(%d)\n",encap);
*/
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 03266b975d..2a770a594c 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -811,7 +811,7 @@ int libpcap_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (wtap_wtap_encap_to_pcap_encap(encap) == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index cb6e0067ee..b1ab83dbe4 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -305,7 +305,7 @@ int logcat_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap != WTAP_ENCAP_LOGCAT && encap != WTAP_ENCAP_WIRESHARK_UPPER_PDU)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index 674991d53a..a0da65616e 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -314,7 +314,7 @@ int logcat_text_brief_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -328,7 +328,7 @@ int logcat_text_process_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -342,7 +342,7 @@ int logcat_text_tag_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -356,7 +356,7 @@ int logcat_text_time_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -370,7 +370,7 @@ int logcat_text_thread_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -384,7 +384,7 @@ int logcat_text_threadtime_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -398,7 +398,7 @@ int logcat_text_long_dump_can_write_encap(int encap) {
case WTAP_ENCAP_WIRESHARK_UPPER_PDU:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 9b23d284b7..7d0592890e 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -942,7 +942,7 @@ int netmon_dump_can_write_encap_1_x(int encap)
* format.
*/
if (encap < 0 || (unsigned) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
@@ -957,7 +957,7 @@ int netmon_dump_can_write_encap_2_x(int encap)
return 0;
if (encap < 0 || (unsigned) encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
@@ -1052,7 +1052,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/*
* No. Fail.
*/
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err = WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index e5a80836a6..f8764ab43c 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -1606,7 +1606,7 @@ int nstrace_10_dump_can_write_encap(int encap)
if (encap == WTAP_ENCAP_NSTRACE_1_0)
return 0;
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
@@ -1617,7 +1617,7 @@ int nstrace_20_dump_can_write_encap(int encap)
if (encap == WTAP_ENCAP_NSTRACE_2_0)
return 0;
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
/* Returns 0 if we could write the specified encapsulation type,
@@ -1627,7 +1627,7 @@ int nstrace_30_dump_can_write_encap(int encap)
if (encap == WTAP_ENCAP_NSTRACE_3_0)
return 0;
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
/* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index f859c2e265..88d42e6e8f 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -646,7 +646,7 @@ int nettl_dump_can_write_encap(int encap)
case WTAP_ENCAP_NETTL_UNKNOWN:
return 0;
default:
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
}
@@ -764,7 +764,7 @@ static gboolean nettl_dump(wtap_dumper *wdh,
#endif
default:
/* found one we don't support */
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err = WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index 54c97b0758..7eb647b575 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -567,7 +567,7 @@ int network_instruments_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap < 0 || (wtap_to_observer_encap(encap) == OBSERVER_UNDEFINED))
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index fad1f8454e..fa047ccaca 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1690,7 +1690,7 @@ netxray_dump_can_write_encap_1_1(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (wtap_encap_to_netxray_1_1_encap(encap) == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
@@ -1867,7 +1867,7 @@ netxray_dump_can_write_encap_2_0(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (wtap_encap_to_netxray_2_0_encap(encap) == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 3f31395e0d..06ba78468b 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1957,7 +1957,7 @@ ngsniffer_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap < 0 || (unsigned)encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 7c44a10e9b..41edb34007 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -2791,7 +2791,7 @@ pcapng_write_if_descr_block(wtap_dumper *wdh, wtapng_if_descr_t *int_data, int *
int_data->snap_len);
if (int_data->link_type == (guint16)-1) {
- *err = WTAP_ERR_UNSUPPORTED_ENCAP;
+ *err = WTAP_ERR_UNWRITABLE_ENCAP;
return FALSE;
}
@@ -3834,7 +3834,7 @@ int pcapng_dump_can_write_encap(int wtap_encap)
/* Make sure we can figure out this DLT type */
if (wtap_wtap_encap_to_pcap_encap(wtap_encap) == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 9bd2cdbc74..88aecaf7a8 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -781,7 +781,7 @@ int snoop_dump_can_write_encap(int encap)
return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
if (encap < 0 || (unsigned)encap >= NUM_WTAP_ENCAPS || wtap_encap[encap] == -1)
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
return 0;
}
diff --git a/wiretap/visual.c b/wiretap/visual.c
index e29b79009f..02acaf711b 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -605,7 +605,7 @@ int visual_dump_can_write_encap(int encap)
return 0;
}
- return WTAP_ERR_UNSUPPORTED_ENCAP;
+ return WTAP_ERR_UNWRITABLE_ENCAP;
}
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index e8726e280d..6ce8f38dda 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -834,7 +834,7 @@ static const char *wtap_errlist[] = {
/* WTAP_ERR_UNSUPPORTED_FILE_TYPE */
"Files can't be saved in that format",
- /* WTAP_ERR_UNSUPPORTED_ENCAP */
+ /* WTAP_ERR_UNWRITABLE_ENCAP */
"Files from that network type can't be saved in that format",
/* WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED */
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 55b35448c3..2590bb35e9 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1684,7 +1684,7 @@ int wtap_register_encap_type(const char* name, const char* short_name);
#define WTAP_ERR_UNSUPPORTED_FILE_TYPE -7
/** Wiretap can't save files in the specified format */
-#define WTAP_ERR_UNSUPPORTED_ENCAP -8
+#define WTAP_ERR_UNWRITABLE_ENCAP -8
/** Wiretap can't read or save files in the specified format with the
specified encapsulation */