diff options
| author | Guy Harris <gharris@sonic.net> | 2021-02-09 13:40:59 -0800 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-02-09 22:32:57 +0000 |
| commit | 09684644ee676078e593acbcce2c3467239a9778 (patch) | |
| tree | c2da722b0bf232cd0cfd07a987d891780b005b72 /wiretap/merge.c | |
| parent | d67b856d62fc8340c4584ce40bedb7c7ba1794f2 (diff) | |
| download | wireshark-09684644ee676078e593acbcce2c3467239a9778.tar.gz wireshark-09684644ee676078e593acbcce2c3467239a9778.tar.bz2 wireshark-09684644ee676078e593acbcce2c3467239a9778.zip | |
wiretap: clean up WTAP_BLOCK_ names.
Remove NG from the names - it adds nothing.
Don't use the abbreviations for pcapng block names, spell out what the
block does (e.g. "WTAP_BLOCK_DECRYPTION_SECRETS" rather than
"WTAP_BLOCK_DSB"), to make it more obvious what the block does.
Spell out some other abbreviations.
Add WTAP_BLOCK_PACKET for future use for packet blocks; there's no need
to distinguish between the Enhanced Packet Block, the Simple Packet
Block, and the deprecated Packet Block here.
Diffstat (limited to 'wiretap/merge.c')
| -rw-r--r-- | wiretap/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c index 632453bf5f..2c18d27aec 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -713,7 +713,7 @@ static guint add_idb_to_merged_file(wtapng_iface_descriptions_t *merged_idb_list, const wtap_block_t input_file_idb) { - wtap_block_t idb = wtap_block_create(WTAP_BLOCK_IF_DESCR); + wtap_block_t idb = wtap_block_create(WTAP_BLOCK_IF_DESCRIPTION); wtapng_if_descr_mandatory_t* idb_mand; g_assert(merged_idb_list != NULL); |