diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-17 16:02:50 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-18 00:03:26 +0000 |
| commit | 51522b33723dec4dd0481dcabc261010be39937c (patch) | |
| tree | 4c772ba5dd3a61a470784464e39573ca27c5028c /wiretap/ngsniffer.c | |
| parent | 8ce0f122011f26ab4e81172e9899ed27a5508abd (diff) | |
| download | wireshark-51522b33723dec4dd0481dcabc261010be39937c.tar.gz | |
Handle "I can't map this for that file format" better.
For cases where record (meta)data is something that can't be written out
in a particular file format, return WTAP_ERR_UNWRITABLE_REC_DATA along
with an err_info string.
Report (and free) that err_info string in cases where
WTAP_ERR_UNWRITABLE_REC_DATA is returned.
Clean up some other error reporting cases, and flag with an XXX some
cases where we aren't reporting errors at all, while we're at it.
Change-Id: I91d02093af0d42c24ec4634c2c773b30f3d39ab3
Reviewed-on: https://code.wireshark.org/review/5823
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/ngsniffer.c')
| -rw-r--r-- | wiretap/ngsniffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 06ba78468b..60ad2e113e 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -528,7 +528,7 @@ static int fix_pseudo_header(int encap, Buffer *buf, int len, static void ngsniffer_sequential_close(wtap *wth); static void ngsniffer_close(wtap *wth); static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const guint8 *pd, int *err); + const guint8 *pd, int *err, gchar **err_info); static gboolean ngsniffer_dump_close(wtap_dumper *wdh, int *err); static int SnifferDecompress( unsigned char * inbuf, size_t inlen, unsigned char * outbuf, size_t outlen, int *err, gchar **err_info ); @@ -1993,7 +1993,7 @@ ngsniffer_dump_open(wtap_dumper *wdh, int *err) Returns TRUE on success, FALSE on failure. */ static gboolean ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const guint8 *pd, int *err) + const guint8 *pd, int *err, gchar **err_info _U_) { const union wtap_pseudo_header *pseudo_header = &phdr->pseudo_header; ngsniffer_dump_t *ngsniffer = (ngsniffer_dump_t *)wdh->priv; |