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/file_access.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/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index b8ca248e00..bd0ff41f00 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -877,7 +877,7 @@ wtap_open_offline(const char *filename, unsigned int type, int *err, char **err_ wth->priv = NULL; wth->wslua_data = NULL; wth->shb_hdrs = g_array_new(FALSE, FALSE, sizeof(wtap_block_t)); - shb = wtap_block_create(WTAP_BLOCK_NG_SECTION); + shb = wtap_block_create(WTAP_BLOCK_SECTION); if (shb) g_array_append_val(wth->shb_hdrs, shb); @@ -2349,7 +2349,7 @@ wtap_dump_init_dumper(int file_type_subtype, wtap_compression_type compression_t int snaplen; // XXX IDBs should be optional. - descr = wtap_block_create(WTAP_BLOCK_IF_DESCR); + descr = wtap_block_create(WTAP_BLOCK_IF_DESCRIPTION); descr_mand = (wtapng_if_descr_mandatory_t*)wtap_block_get_mandatory_data(descr); descr_mand->wtap_encap = params->encap; descr_mand->tsprecision = params->tsprec; |