From 51522b33723dec4dd0481dcabc261010be39937c Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 17 Dec 2014 16:02:50 -0800 Subject: 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 --- wiretap/logcat_text.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'wiretap/logcat_text.c') diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index 96ec2cb656..c7bad0d7cf 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -404,7 +404,7 @@ int logcat_text_long_dump_can_write_encap(int encap) { static gboolean logcat_text_dump_text(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, - const guint8 *pd, int *err) + const guint8 *pd, int *err, gchar **err_info) { gchar *buf; gint length; @@ -474,7 +474,9 @@ static gboolean logcat_text_dump_text(wtap_dumper *wdh, msg_pre_skip = 1 + (gint) strlen(tag) + 1; msg_begin = msg_payload + msg_pre_skip; } else { - *err = WTAP_ERR_UNSUPPORTED; + *err = WTAP_ERR_UNWRITABLE_REC_DATA; + *err_info = g_strdup_printf("logcat: version %d isn't supported", + logcat_version); return FALSE; } -- cgit v1.2.1