osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2014-12-17 16:31:49 -08:00
parent 51522b3372
commit aa27e665b1
26 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editcap.c
View File

@ -1667,7 +1667,7 @@ main(int argc, char *argv[])
wtap_file_type_subtype_string(out_file_type_subtype));
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're
* writing and the file type and subtype we're

4
file.c
View File

@ -1599,7 +1599,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
g_free(display_basename);
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're writing and
* the file type and subtype we're writing; note that, and report
@ -4203,7 +4203,7 @@ save_record(capture_file *cf, frame_data *fdata,
fdata->num, wtap_file_type_subtype_string(args->file_type));
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're writing and
* the file type and subtype we're writing; note that, and report

2
mergecap.c
View File

@ -583,7 +583,7 @@ main(int argc, char *argv[])
wtap_file_type_subtype_string(file_type));
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're writing and
* the file type and subtype we're wwriting; note that, and

4
tshark.c
View File

@ -3272,7 +3272,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
wtap_file_type_subtype_short_string(out_file_type));
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're writing
* and the file type and subtype we're writing; note that,
@ -3381,7 +3381,7 @@ load_cap_file(capture_file *cf, char *save_file, int out_file_type,
wtap_file_type_subtype_short_string(out_file_type));
break;
case WTAP_ERR_REC_TYPE_UNSUPPORTED:
case WTAP_ERR_UNWRITABLE_REC_TYPE:
/*
* This is a problem with the particular record we're writing
* and the file type and subtype we're writing; note that,

2
wiretap/5views.c
View File

@ -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;
}

4
wiretap/btsnoop.c
View File

@ -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;
}

2
wiretap/catapult_dct2000.c
View File

@ -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;
}

2
wiretap/commview.c
View File

@ -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;
}

2
wiretap/erf.c
View File

@ -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;
}

2
wiretap/eyesdn.c
View File

@ -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;
}

2
wiretap/k12.c
View File

@ -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;
}

2
wiretap/lanalyzer.c
View File

@ -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;
}

2
wiretap/libpcap.c
View File

@ -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;
}

2
wiretap/logcat.c
View File

@ -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;
}

2
wiretap/logcat_text.c
View File

@ -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;
}

2
wiretap/netmon.c
View File

@ -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;
}

2
wiretap/netscaler.c
View File

@ -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;
}

2
wiretap/nettl.c
View File

@ -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;
}

2
wiretap/network_instruments.c
View File

@ -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;
}

4
wiretap/netxray.c
View File

@ -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;
}

2
wiretap/ngsniffer.c
View File

@ -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;
}

4
wiretap/pcapng.c
View File

@ -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;
}

2
wiretap/snoop.c
View File

@ -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;
}

2
wiretap/visual.c
View File

@ -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;
}

2
wiretap/wtap.c
View File

@ -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 */

2
wiretap/wtap.h
View File

@ -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