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/netxray.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/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 536afc3dfd..ab23bd62c7 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -412,11 +412,11 @@ static void netxray_guess_atm_type(wtap *wth, struct wtap_pkthdr *phdr, static gboolean netxray_dump_1_1(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, int *err, gchar **err_info); -static gboolean netxray_dump_close_1_1(wtap_dumper *wdh, int *err); +static gboolean netxray_dump_finish_1_1(wtap_dumper *wdh, int *err); static gboolean netxray_dump_2_0(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, int *err, gchar **err_info); -static gboolean netxray_dump_close_2_0(wtap_dumper *wdh, int *err); +static gboolean netxray_dump_finish_2_0(wtap_dumper *wdh, int *err); wtap_open_return_val netxray_open(wtap *wth, int *err, gchar **err_info) @@ -1709,7 +1709,7 @@ netxray_dump_open_1_1(wtap_dumper *wdh, int *err) netxray_dump_t *netxray; wdh->subtype_write = netxray_dump_1_1; - wdh->subtype_close = netxray_dump_close_1_1; + wdh->subtype_finish = netxray_dump_finish_1_1; /* We can't fill in all the fields in the file header, as we haven't yet written any packets. As we'll have to rewrite @@ -1797,7 +1797,7 @@ netxray_dump_1_1(wtap_dumper *wdh, /* Finish writing to a dump file. Returns TRUE on success, FALSE on failure. */ static gboolean -netxray_dump_close_1_1(wtap_dumper *wdh, int *err) +netxray_dump_finish_1_1(wtap_dumper *wdh, int *err) { char hdr_buf[CAPTUREFILE_HEADER_SIZE - sizeof(netxray_magic)]; netxray_dump_t *netxray = (netxray_dump_t *)wdh->priv; @@ -1886,7 +1886,7 @@ netxray_dump_open_2_0(wtap_dumper *wdh, int *err) netxray_dump_t *netxray; wdh->subtype_write = netxray_dump_2_0; - wdh->subtype_close = netxray_dump_close_2_0; + wdh->subtype_finish = netxray_dump_finish_2_0; /* We can't fill in all the fields in the file header, as we haven't yet written any packets. As we'll have to rewrite @@ -2006,7 +2006,7 @@ netxray_dump_2_0(wtap_dumper *wdh, /* Finish writing to a dump file. Returns TRUE on success, FALSE on failure. */ static gboolean -netxray_dump_close_2_0(wtap_dumper *wdh, int *err) +netxray_dump_finish_2_0(wtap_dumper *wdh, int *err) { char hdr_buf[CAPTUREFILE_HEADER_SIZE - sizeof(netxray_magic)]; netxray_dump_t *netxray = (netxray_dump_t *)wdh->priv; |