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/iptrace.c | |
| parent | d67b856d62fc8340c4584ce40bedb7c7ba1794f2 (diff) | |
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/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index f652cd2693..1b471bc9bc 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -329,7 +329,7 @@ iptrace_read_rec_1_0(wtap *wth, FILE_T fh, wtap_rec *rec, Buffer *buf, /* * Now make a new IDB and add it. */ - int_data = wtap_block_create(WTAP_BLOCK_IF_DESCR); + int_data = wtap_block_create(WTAP_BLOCK_IF_DESCRIPTION); int_data_mand = (wtapng_if_descr_mandatory_t *)wtap_block_get_mandatory_data(int_data); int_data_mand->wtap_encap = rec->rec_header.packet_header.pkt_encap; @@ -600,7 +600,7 @@ iptrace_read_rec_2_0(wtap *wth, FILE_T fh, wtap_rec *rec, Buffer *buf, /* * Now make a new IDB and add it. */ - int_data = wtap_block_create(WTAP_BLOCK_IF_DESCR); + int_data = wtap_block_create(WTAP_BLOCK_IF_DESCRIPTION); int_data_mand = (wtapng_if_descr_mandatory_t *)wtap_block_get_mandatory_data(int_data); int_data_mand->wtap_encap = rec->rec_header.packet_header.pkt_encap; |