diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-09 11:54:18 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-09 19:55:13 +0000 |
| commit | 09f5ff4fc6895f375b3ea07f6151d8e09377fd52 (patch) | |
| tree | 5829d926242a6297803d52417c41ea5512536c23 /wiretap/visual.c | |
| parent | fe12759b8e0370dd3e4e8434b4140c098ade7a38 (diff) | |
| download | wireshark-09f5ff4fc6895f375b3ea07f6151d8e09377fd52.tar.gz | |
Call the dumper routine to finish write a file the "finish" routine.
It doesn't actually *close* any handle, so it's best called a "finish"
routine rather than a "close" routine.
In libwiretap modules, don't bother setting the finish routine pointer
to null - it's already initialized to null (it's probably best not to
require modules to set it).
Change-Id: I19554f3fb826db495f17b36600ae36222cbc21b0
Reviewed-on: https://code.wireshark.org/review/11659
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/visual.c')
| -rw-r--r-- | wiretap/visual.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/visual.c b/wiretap/visual.c index dd40f2971e..2bf675a444 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -165,7 +165,7 @@ static gboolean visual_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info); static gboolean visual_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, int *err, gchar **err_info); -static gboolean visual_dump_close(wtap_dumper *wdh, int *err); +static gboolean visual_dump_finish(wtap_dumper *wdh, int *err); static void visual_dump_free(wtap_dumper *wdh); @@ -612,7 +612,7 @@ gboolean visual_dump_open(wtap_dumper *wdh, int *err) /* Set the write routines for a visual file. */ wdh->subtype_write = visual_dump; - wdh->subtype_close = visual_dump_close; + wdh->subtype_finish = visual_dump_finish; /* Create a struct to hold file information for the duration of the write */ @@ -760,7 +760,7 @@ static gboolean visual_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, /* Finish writing to a dump file. Returns TRUE on success, FALSE on failure. */ -static gboolean visual_dump_close(wtap_dumper *wdh, int *err) +static gboolean visual_dump_finish(wtap_dumper *wdh, int *err) { struct visual_write_info * visual = (struct visual_write_info *)wdh->priv; size_t n_to_write; |