diff options
| author | Guy Harris <gharris@sonic.net> | 2022-03-14 12:11:24 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2022-03-14 19:12:20 +0000 |
| commit | 109b92b5d796f2fb64491fe1976257bc976f1f40 (patch) | |
| tree | fa9fe0a1d1e9dc33aa6cb25774bf19ae3a53d60b /wiretap/file_access.c | |
| parent | 304dae33d68d923cd2da6d405d999f8a8527ba71 (diff) | |
wiretap: have wtap_dump_close() provide a "needs to be reloaded" indication.
This allows the "needs to be reloaded" indication to be set in the close
process, as is the case for ERF; having a routine that returns the value
of that indication is not useful if it gets seet in the close process,
as the handle for the wtap_dumper is no longer valid after
wtap_dump_close() finishes.
We also get rid of wtap_dump_get_needs_reload(), as callers should get
that information via the added argument to wtap_dump_close().
Fixes #17989.
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index adf98b88cd..d2911bc601 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -2621,7 +2621,8 @@ wtap_dump_flush(wtap_dumper *wdh, int *err) } gboolean -wtap_dump_close(wtap_dumper *wdh, int *err, gchar **err_info) +wtap_dump_close(wtap_dumper *wdh, gboolean *needs_reload, + int *err, gchar **err_info) { gboolean ret = TRUE; @@ -2643,6 +2644,8 @@ wtap_dump_close(wtap_dumper *wdh, int *err, gchar **err_info) } ret = FALSE; } + if (needs_reload != NULL) + *needs_reload = wdh->needs_reload; g_free(wdh->priv); wtap_block_array_free(wdh->interface_data); wtap_block_array_free(wdh->dsbs_initial); @@ -2709,10 +2712,6 @@ wtap_dump_discard_decryption_secrets(wtap_dumper *wdh) } } -gboolean wtap_dump_get_needs_reload(wtap_dumper *wdh) { - return wdh->needs_reload; -} - /* internally open a file for writing (compressed or not) */ #ifdef HAVE_ZLIB static WFILE_T |