From 109b92b5d796f2fb64491fe1976257bc976f1f40 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 14 Mar 2022 12:11:24 -0700 Subject: 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. --- tshark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 5244f5670e..f23c4426a9 100644 --- a/tshark.c +++ b/tshark.c @@ -3895,14 +3895,14 @@ process_cap_file(capture_file *cf, char *save_file, int out_file_type, } } /* Now close the capture file. */ - if (!wtap_dump_close(pdh, &err, &err_info)) { + if (!wtap_dump_close(pdh, NULL, &err, &err_info)) { cfile_close_failure_message(save_file, err, err_info); status = PROCESS_FILE_ERROR; } } else { /* We got a write error; it was reported, so just close the dump file without bothering to check for further errors. */ - wtap_dump_close(pdh, &err, &err_info); + wtap_dump_close(pdh, NULL, &err, &err_info); g_free(err_info); status = PROCESS_FILE_ERROR; } -- cgit v1.2.3