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/netmon.c | |
| parent | fe12759b8e0370dd3e4e8434b4140c098ade7a38 (diff) | |
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/netmon.c')
| -rw-r--r-- | wiretap/netmon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 7abc7c677d..b792c2ddfd 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -183,7 +183,7 @@ static gboolean netmon_read_atm_pseudoheader(FILE_T fh, static void netmon_sequential_close(wtap *wth); static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, int *err, gchar **err_info); -static gboolean netmon_dump_close(wtap_dumper *wdh, int *err); +static gboolean netmon_dump_finish(wtap_dumper *wdh, int *err); wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info) { @@ -945,7 +945,7 @@ gboolean netmon_dump_open(wtap_dumper *wdh, int *err) return FALSE; wdh->subtype_write = netmon_dump; - wdh->subtype_close = netmon_dump_close; + wdh->subtype_finish = netmon_dump_finish; netmon = (netmon_dump_t *)g_malloc(sizeof(netmon_dump_t)); wdh->priv = (void *)netmon; @@ -1208,7 +1208,7 @@ static gboolean netmon_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, /* Finish writing to a dump file. Returns TRUE on success, FALSE on failure. */ -static gboolean netmon_dump_close(wtap_dumper *wdh, int *err) +static gboolean netmon_dump_finish(wtap_dumper *wdh, int *err) { netmon_dump_t *netmon = (netmon_dump_t *)wdh->priv; size_t n_to_write; |