diff options
| author | Guy Harris <gharris@sonic.net> | 2020-10-21 19:10:49 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-10-21 19:10:49 -0700 |
| commit | 7c488e4c71247d2ba2b5676feb39504266b92783 (patch) | |
| tree | 2849a98650e734829c7baf002a44836da07f4fc3 /wiretap/file_access.c | |
| parent | ec59b17544cac642a6cf06da234e9a17851ee3a9 (diff) | |
Add a routine to make a newly-allocated copy of a block.
It currently wraps wtap_block_create() and wtap_block_copy(); if there
are no remaining use cases for wtap_block_copy() at some point, it can
just *replace* wtap_block_copy().
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 9324bb9177..43193343a6 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -2336,8 +2336,7 @@ wtap_dump_init_dumper(int file_type_subtype, wtap_compression_type compression_t for (itf_count = 0; itf_count < interfaces->len; itf_count++) { file_int_data = g_array_index(interfaces, wtap_block_t, itf_count); file_int_data_mand = (wtapng_if_descr_mandatory_t*)wtap_block_get_mandatory_data(file_int_data); - descr = wtap_block_create(WTAP_BLOCK_IF_DESCR); - wtap_block_copy(descr, file_int_data); + descr = wtap_block_make_copy(file_int_data); if ((params->encap != WTAP_ENCAP_PER_PACKET) && (params->encap != file_int_data_mand->wtap_encap)) { descr_mand = (wtapng_if_descr_mandatory_t*)wtap_block_get_mandatory_data(descr); descr_mand->wtap_encap = params->encap; |