aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-12-17 16:31:49 -0800
committerGuy Harris <guy@alum.mit.edu>2014-12-18 00:32:14 +0000
commitaa27e665b1d469e54b8cbb9931d5324acdf4dc75 (patch)
tree809a647ffb7f63cad7d2cfadda44c46a7f439ba6 /wiretap
parent51522b33723dec4dd0481dcabc261010be39937c (diff)
Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE.
That indicates that it's a problem specific to *writing* capture files; we've already converted some errors to that style, and added a new one in that style. Change-Id: I8268316fd8b1a9e301bf09ae970b4b1fbcb35c9d Reviewed-on: https://code.wireshark.org/review/5826 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/5views.c2
-rw-r--r--wiretap/btsnoop.c4
-rw-r--r--wiretap/catapult_dct2000.c2
-rw-r--r--wiretap/commview.c2
-rw-r--r--wiretap/erf.c2
-rw-r--r--wiretap/eyesdn.c2
-rw-r--r--wiretap/k12.c2
-rw-r--r--wiretap/lanalyzer.c2
-rw-r--r--wiretap/libpcap.c2
-rw-r--r--wiretap/logcat.c2
-rw-r--r--wiretap/logcat_text.c2
-rw-r--r--wiretap/netmon.c2
-rw-r--r--wiretap/netscaler.c2
-rw-r--r--wiretap/nettl.c2
-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
22 files changed, 25 insertions, 25 deletions
diff --git a/wiretap/5views.c b/wiretap/5views.c
index 67de759c1d..287181f1a4 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -358,7 +358,7 @@ static gboolean _5views_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
index ee6231e3b2..8c3212cc51 100644
--- a/wiretap/btsnoop.c
+++ b/wiretap/btsnoop.c
@@ -320,7 +320,7 @@ static gboolean btsnoop_dump_h1(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
@@ -365,7 +365,7 @@ static gboolean btsnoop_dump_h4(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 59ed3958df..90439b9a8b 100644
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -606,7 +606,7 @@ catapult_dct2000_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/commview.c b/wiretap/commview.c
index 6c410f950e..d2d178a250 100644
--- a/wiretap/commview.c
+++ b/wiretap/commview.c
@@ -321,7 +321,7 @@ static gboolean commview_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/erf.c b/wiretap/erf.c
index acf06057f6..bbd20b906b 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -606,7 +606,7 @@ static gboolean erf_dump(
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 25e046edd6..ac8f2f879d 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -407,7 +407,7 @@ static gboolean eyesdn_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/k12.c b/wiretap/k12.c
index af1f4d84ca..611026829e 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -1271,7 +1271,7 @@ static gboolean k12_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 26655cdb12..ae535d31c6 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -638,7 +638,7 @@ static gboolean lanalyzer_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index 0aebcc30c7..19712f1ee5 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -900,7 +900,7 @@ static gboolean libpcap_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/logcat.c b/wiretap/logcat.c
index de11a42958..69b05c80dd 100644
--- a/wiretap/logcat.c
+++ b/wiretap/logcat.c
@@ -318,7 +318,7 @@ static gboolean logcat_binary_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index c7bad0d7cf..cbeede293f 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -428,7 +428,7 @@ static gboolean logcat_text_dump_text(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index a8648493da..3bb57763a7 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1010,7 +1010,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index e8a0eb5ae5..ad2840bf82 100644
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -1790,7 +1790,7 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index cb885661f9..8c93af940d 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -690,7 +690,7 @@ static gboolean nettl_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index bf96b30cf8..8c3753427e 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -676,7 +676,7 @@ static gboolean observer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 69136373e0..69b39a3faf 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1737,7 +1737,7 @@ netxray_dump_1_1(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
@@ -1916,7 +1916,7 @@ netxray_dump_2_0(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 60ad2e113e..2eda7663e8 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -2010,7 +2010,7 @@ ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 5ad679091a..98e5e1e47b 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -3729,14 +3729,14 @@ static gboolean pcapng_dump(wtap_dumper *wdh,
#endif
{
/* No. */
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
break;
default:
/* We don't support writing this record type. */
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 67816b438c..bba1b29411 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -825,7 +825,7 @@ static gboolean snoop_dump(wtap_dumper *wdh,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 01b353446b..3bb8043e86 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -653,7 +653,7 @@ static gboolean visual_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
/* We can only write packet records. */
if (phdr->rec_type != REC_TYPE_PACKET) {
- *err = WTAP_ERR_REC_TYPE_UNSUPPORTED;
+ *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
return FALSE;
}
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 40cabd0821..731ab26091 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -882,7 +882,7 @@ static const char *wtap_errlist[] = {
/* WTAP_ERR_CHECK_WSLUA */
NULL,
- /* WTAP_ERR_REC_TYPE_UNSUPPORTED */
+ /* WTAP_ERR_UNWRITABLE_REC_TYPE */
"That record type cannot be written in that format",
/* WTAP_ERR_UNWRITABLE_REC_DATA */
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 5e707a24db..e27ee772b0 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1736,7 +1736,7 @@ int wtap_register_encap_type(const char* name, const char* short_name);
/** Not really an error: the file type being checked is from a Lua
plugin, so that the code will call wslua_can_write_encap() instead if it gets this */
-#define WTAP_ERR_REC_TYPE_UNSUPPORTED -24
+#define WTAP_ERR_UNWRITABLE_REC_TYPE -24
/** Specified record type can't be written to that file type */
#define WTAP_ERR_UNWRITABLE_REC_DATA -25
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 09:07:12 +0000