X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fraw_analog.c;h=a72cbd024b2c6b1cc141eb0b1c57e7cb690ee71f;hb=e7136c626f433bcdc101eaa24191ce5682803540;hp=491bb8167b9d5fb9614d1ae8b99a7f161321515b;hpb=221cec31fc51ffeeb2ad222bb9e796229fa7e9c4;p=libsigrok.git

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index 491bb816..a72cbd02 100644
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -48,32 +48,31 @@ struct context {
 };
 
 struct sample_format {
-	const char const* fmt_name;
+	const char const *fmt_name;
 	struct sr_analog_encoding encoding;
 };
 
 static const struct sample_format const sample_formats[] =
 {
-	{ "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,         128}, { 0, 1}}},
-	{ "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,         255}, {-1, 2}}},
-	{ "S16_LE",     { 2, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
-	{ "U16_LE",     { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
-	{ "S16_BE",     { 2, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
-	{ "U16_BE",     { 2, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
-	{ "S32_LE",     { 4, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
-	{ "U32_LE",     { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
-	{ "S32_BE",     { 4, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
-	{ "U32_BE",     { 4, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
-	{ "FLOAT_LE",   { 4, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
-	{ "FLOAT_BE",   { 4, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
-	{ "FLOAT64_LE", { 8, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
-	{ "FLOAT64_BE", { 8, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
+	{ "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,                     128}, { 0, 1}}},
+	{ "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,                     255}, {-1, 2}}},
+	{ "S16_LE",     { 2, TRUE,  FALSE, FALSE, 0, TRUE, { 1,           INT16_MAX + 1}, { 0, 1}}},
+	{ "U16_LE",     { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1,              UINT16_MAX}, {-1, 2}}},
+	{ "S16_BE",     { 2, TRUE,  FALSE, TRUE,  0, TRUE, { 1,           INT16_MAX + 1}, { 0, 1}}},
+	{ "U16_BE",     { 2, FALSE, FALSE, TRUE,  0, TRUE, { 1,              UINT16_MAX}, {-1, 2}}},
+	{ "S32_LE",     { 4, TRUE,  FALSE, FALSE, 0, TRUE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+	{ "U32_LE",     { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1,              UINT32_MAX}, {-1, 2}}},
+	{ "S32_BE",     { 4, TRUE,  FALSE, TRUE,  0, TRUE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+	{ "U32_BE",     { 4, FALSE, FALSE, TRUE,  0, TRUE, { 1,              UINT32_MAX}, {-1, 2}}},
+	{ "FLOAT_LE",   { 4, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,                       1}, { 0, 1}}},
+	{ "FLOAT_BE",   { 4, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,                       1}, { 0, 1}}},
+	{ "FLOAT64_LE", { 8, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,                       1}, { 0, 1}}},
+	{ "FLOAT64_BE", { 8, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,                       1}, { 0, 1}}},
 };
 
 static int parse_format_string(const char *format)
 {
-	int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
-	for (int i = 0; i < num_formats; i++) {
+	for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
 		if (!strcmp(format, sample_formats[i].fmt_name))
 			return i;
 	}
@@ -119,8 +118,7 @@ static int init(struct sr_input *in, GHashTable *options)
 	format = g_variant_get_string(g_hash_table_lookup(options, "format"), NULL);
 	if ((fmt_index = parse_format_string(format)) == -1) {
 		GString *formats = g_string_sized_new(200);
-		int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
-		for (int i = 0; i < num_formats; i++)
+		for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++)
 			g_string_append_printf(formats, "%s ", sample_formats[i].fmt_name);
 		sr_err("Invalid format '%s': must be one of: %s.",
 		       format, formats->str);
@@ -246,12 +244,11 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
-	int num_formats = sizeof(sample_formats)/ sizeof(sample_formats[0]);
 	if (!options[0].def) {
 		options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
 		options[1].def = g_variant_ref_sink(g_variant_new_uint64(DEFAULT_SAMPLERATE));
 		options[2].def = g_variant_ref_sink(g_variant_new_string(sample_formats[0].fmt_name));
-		for (int i = 0; i < num_formats; i++) {
+		for (unsigned int i = 0; i < ARRAY_SIZE(sample_formats); i++) {
 			options[2].values = g_slist_append(options[2].values,
 				g_variant_ref_sink(g_variant_new_string(sample_formats[i].fmt_name)));
 		}