From: Gerhard Sittig <redacted>
Date: Tue, 24 Apr 2018 21:28:41 +0000 (+0200)
Subject: input/trace32_ad: silence format errors during input format match
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=cdb134eb19e23528ec9c9dd89805087ea3edb9b6;p=libsigrok.git

input/trace32_ad: silence format errors during input format match

When auto-detection tries to find the input module that can handle a
file, unexpected input format should be considered non-fatal. Only emit
error messages when process_header() got invoked from process_buffer()
after initialization. Emit debug messages in early stages where no input
module context exists yet.
---

diff --git a/src/input/trace32_ad.c b/src/input/trace32_ad.c
index 6cb6bcb4..779c0dac 100644
--- a/src/input/trace32_ad.c
+++ b/src/input/trace32_ad.c
@@ -213,12 +213,18 @@ static int process_header(GString *buf, struct context *inc)
 			inc->format = AD_FORMAT_TXTHDR;
 		g_free(format_name_sig);
 		g_free(format_name);
-		sr_err("This format isn't implemented yet, aborting.");
+		if (inc)
+			sr_err("This format isn't implemented yet, aborting.");
+		else
+			sr_dbg("Not a supported trace32 input file.");
 		return SR_ERR;
 	} else {
 		g_free(format_name_sig);
 		g_free(format_name);
-		sr_err("Don't know this file format, aborting.");
+		if (inc)
+			sr_err("Don't know this file format, aborting.");
+		else
+			sr_dbg("Not a trace32 input file.");
 		return SR_ERR;
 	}