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.

1 files changed, 1 insertions, 1 deletions

diff --git a/editcap.c b/editcap.c
index 175dca693f..97d907d026 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1640,7 +1640,7 @@ main(int argc, char *argv[])
             /* Warn for badly formatted files, but proceed anyway. */
             validate_secrets_file(secrets_filename, secrets_type_id, data);
 
-            block = wtap_block_create(WTAP_BLOCK_DSB);
+            block = wtap_block_create(WTAP_BLOCK_DECRYPTION_SECRETS);
             dsb = (wtapng_dsb_mandatory_t *)wtap_block_get_mandatory_data(block);
             dsb->secrets_type = secrets_type_id;
             dsb->secrets_len = (guint)data_len;