diff options
| author | Guy Harris <gharris@sonic.net> | 2021-06-17 15:04:44 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-06-17 15:04:44 -0700 |
| commit | 9773b5a4a78ad25865df79ef9b5cd6ddfb3f1b67 (patch) | |
| tree | 7e16baa5495cc5b2564dc974a2d19a97178983f4 /wiretap | |
| parent | 6eb3703379e027be51636d7f173ed50843a05c34 (diff) | |
Just call the block type for custom blocks WTAP_BLOCK_CUSTOM.
No need to add a redundant "_BLOCK" at the end.
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcapng.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap_opttypes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index caeb3e7f50..e611f2e9e2 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -5475,7 +5475,7 @@ static const struct supported_block_type pcapng_blocks_supported[] = { { WTAP_BLOCK_SYSTEMD_JOURNAL_EXPORT, MULTIPLE_BLOCKS_SUPPORTED, OPTION_TYPES_SUPPORTED(systemd_journal_export_block_options_supported) }, /* Multiple custom blocks. */ - { WTAP_BLOCK_CUSTOM_BLOCK, MULTIPLE_BLOCKS_SUPPORTED, NO_OPTIONS_SUPPORTED }, + { WTAP_BLOCK_CUSTOM, MULTIPLE_BLOCKS_SUPPORTED, NO_OPTIONS_SUPPORTED }, }; static const struct file_type_subtype_info pcapng_info = { diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h index 37e17f575c..2f21f9c1d1 100644 --- a/wiretap/wtap_opttypes.h +++ b/wiretap/wtap_opttypes.h @@ -168,7 +168,7 @@ typedef enum { WTAP_BLOCK_FT_SPECIFIC_REPORT, WTAP_BLOCK_FT_SPECIFIC_EVENT, WTAP_BLOCK_SYSTEMD_JOURNAL_EXPORT, - WTAP_BLOCK_CUSTOM_BLOCK, + WTAP_BLOCK_CUSTOM, MAX_WTAP_BLOCK_TYPE_VALUE } wtap_block_type_t; |