From: Soeren Apel <redacted>
Date: Tue, 22 Mar 2016 07:29:25 +0000 (+0100)
Subject: input/raw_analog: Prevent "duplicate const decl specifier" warning
X-Git-Tag: libsigrok-0.5.0~542
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1393bccfcbfa47c55e29b5a453d9d976ebd58a03;p=libsigrok.git

input/raw_analog: Prevent "duplicate const decl specifier" warning

Warnings emitted by gcc before this patch:
src/input/raw_analog.c:51:13: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
        const char const *fmt_name;
                   ^
src/input/raw_analog.c:55:35: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
static const struct sample_format const sample_formats[] =
                                  ^
---

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index a72cbd02..e0b5ceda 100644
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -48,11 +48,11 @@ struct context {
 };
 
 struct sample_format {
-	const char const *fmt_name;
+	const char *fmt_name;
 	struct sr_analog_encoding encoding;
 };
 
-static const struct sample_format const sample_formats[] =
+static const struct sample_format sample_formats[] =
 {
 	{ "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,                     128}, { 0, 1}}},
 	{ "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,                     255}, {-1, 2}}},