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/network_instruments.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/network_instruments.c')
| -rw-r--r-- | wiretap/network_instruments.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 7eb647b575..bf96b30cf8 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -108,7 +108,7 @@ static int read_packet_data(FILE_T fh, int offset_to_frame, int current_offset_f static gboolean skip_to_next_packet(wtap *wth, int offset_to_next_packet, int current_offset_from_packet_header, int *err, char **err_info); static gboolean observer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const guint8 *pd, int *err); + const guint8 *pd, int *err, gchar **err_info); static gint observer_to_wtap_encap(int observer_encap); static gint wtap_to_observer_encap(int wtap_encap); @@ -668,7 +668,7 @@ gboolean network_instruments_dump_open(wtap_dumper *wdh, int *err) Returns TRUE on success, FALSE on failure. */ static gboolean observer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, const guint8 *pd, - int *err) + int *err, gchar **err_info _U_) { observer_dump_private_state * private_state = NULL; packet_entry_header packet_header; |