diff options
| author | Guy Harris <gharris@sonic.net> | 2021-02-13 00:03:51 -0800 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-02-13 01:25:39 -0800 |
| commit | 24acef08857f97928db5f6de8a91370dd404f0da (patch) | |
| tree | 5cd2a8bdb8c341be189c305989830f553ce46f51 /ui/failure_message.c | |
| parent | 28dbff322be940edab90e25a2bc1ded3d6d0ad8b (diff) | |
wiretap: file types have a name and a description.
The "short name" is really just the name, used to look it up. The
"name" is really a description intended solely for human consumption.
Rename the fields, and the functions that access them, to match.
The "description" maintained by Lua for file type handlers is used
*only* for one debugging message; we should probably just eliminate it.
Call it an "internal description" for now.
Diffstat (limited to 'ui/failure_message.c')
| -rw-r--r-- | ui/failure_message.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/failure_message.c b/ui/failure_message.c index c8355fa7c0..f5660122e2 100644 --- a/ui/failure_message.c +++ b/ui/failure_message.c @@ -182,7 +182,7 @@ cfile_dump_open_failure_message(const char *progname, const char *filename, case WTAP_ERR_CANT_WRITE_TO_PIPE: cmdarg_err("The %s is a pipe, and \"%s\" capture files can't be written to a pipe.", file_description, - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_UNWRITABLE_FILE_TYPE: @@ -192,12 +192,12 @@ cfile_dump_open_failure_message(const char *progname, const char *filename, case WTAP_ERR_UNWRITABLE_ENCAP: cmdarg_err("The capture file being read can't be written as a \"%s\" file.", - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED: cmdarg_err("The capture file being read can't be written as a \"%s\" file.", - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_CANT_OPEN: @@ -347,7 +347,7 @@ cfile_write_failure_message(const char *progname, const char *in_filename, */ cmdarg_err("Frame%s has a network type that can't be saved in a \"%s\" file.", in_frame_string, - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED: @@ -358,7 +358,7 @@ cfile_write_failure_message(const char *progname, const char *in_filename, */ cmdarg_err("Frame%s has a network type that differs from the network type of earlier packets, which isn't supported in a \"%s\" file.", in_frame_string, - wtap_file_type_subtype_string(file_type_subtype)); + wtap_file_type_subtype_description(file_type_subtype)); break; case WTAP_ERR_PACKET_TOO_LARGE: @@ -369,7 +369,7 @@ cfile_write_failure_message(const char *progname, const char *in_filename, */ cmdarg_err("Frame%s is larger than %s supports in a \"%s\" file.", in_frame_string, progname, - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_UNWRITABLE_REC_TYPE: @@ -380,7 +380,7 @@ cfile_write_failure_message(const char *progname, const char *in_filename, */ cmdarg_err("Record%s has a record type that can't be saved in a \"%s\" file.", in_frame_string, - wtap_file_type_subtype_short_string(file_type_subtype)); + wtap_file_type_subtype_name(file_type_subtype)); break; case WTAP_ERR_UNWRITABLE_REC_DATA: @@ -392,7 +392,7 @@ cfile_write_failure_message(const char *progname, const char *in_filename, cmdarg_err("Record%s has data that can't be saved in a \"%s\" file.\n" "(%s)", in_frame_string, - wtap_file_type_subtype_short_string(file_type_subtype), + wtap_file_type_subtype_name(file_type_subtype), err_info != NULL ? err_info : "no information supplied"); g_free(err_info); break; |