diff options
| author | David Perry <boolean263@protonmail.com> | 2021-09-10 04:25:13 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <6629907-ws-gitlab-utility@users.noreply.gitlab.com> | 2021-09-10 04:25:13 +0000 |
| commit | 5076aee04431c123b81d0a9e3d69571a4572999a (patch) | |
| tree | d03fc53c05b3188c01500ccaafbe9a5667a14918 /capinfos.c | |
| parent | dee79a0c8190e203960c82a8d2ee922bdf45d6f7 (diff) | |
[#17517] capinfos: machine-readable filetype/encap
Diffstat (limited to 'capinfos.c')
| -rw-r--r-- | capinfos.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/capinfos.c b/capinfos.c index 6b33f9d263..7cef396f2d 100644 --- a/capinfos.c +++ b/capinfos.c @@ -629,8 +629,14 @@ print_stats(const gchar *filename, capture_info *cf_info) gchar *size_string; /* Build printable strings for various stats */ - file_type_string = wtap_file_type_subtype_description(cf_info->file_type); - file_encap_string = wtap_encap_description(cf_info->file_encap); + if (machine_readable) { + file_type_string = wtap_file_type_subtype_name(cf_info->file_type); + file_encap_string = wtap_encap_name(cf_info->file_encap); + } + else { + file_type_string = wtap_file_type_subtype_description(cf_info->file_type); + file_encap_string = wtap_encap_description(cf_info->file_encap); + } if (filename) printf ("File name: %s\n", filename); if (cap_file_type) { @@ -878,8 +884,8 @@ print_stats_table(const gchar *filename, capture_info *cf_info) const gchar *file_type_string, *file_encap_string; /* Build printable strings for various stats */ - file_type_string = wtap_file_type_subtype_description(cf_info->file_type); - file_encap_string = wtap_encap_description(cf_info->file_encap); + file_type_string = wtap_file_type_subtype_name(cf_info->file_type); + file_encap_string = wtap_encap_name(cf_info->file_encap); if (filename) { putquote(); |