From 17cda3db8a4692e35ff3412c5ef9f02258beff1d Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Tue, 17 Dec 2019 12:03:48 +0100
Subject: [PATCH] simtrace2-sniff: Reformat value_string to pass our validation
 scripts

This is a purely cosmetic change in terms of coding style, but it
fixes an [invalid] detection for unterminated value_string arrays
by our verify_value_string_arrays_are_terminated.py script:

Change-Id: Iee905c744065df1dc54f04be752a65700897a92c
ERROR: file contains unterminated value_string 'struct value_string change_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c'
ERROR: file contains unterminated value_string 'struct value_string data_flags[]': './deps/simtrace2/host/src/simtrace2-sniff.c'
---
 host/src/simtrace2-sniff.c | 50 ++++++++------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c
index b2ce4a00..c4cec1ed 100644
--- a/host/src/simtrace2-sniff.c
+++ b/host/src/simtrace2-sniff.c
@@ -61,49 +61,19 @@ struct st_transport {
 };
 
 const struct value_string change_flags[] = {
-	{
-		.value = SNIFF_CHANGE_FLAG_CARD_INSERT,
-		.str = "card inserted",
-	},
-	{
-		.value = SNIFF_CHANGE_FLAG_CARD_EJECT,
-		.str = "card ejected",
-	},
-	{
-		.value = SNIFF_CHANGE_FLAG_RESET_ASSERT,
-		.str = "reset asserted",
-	},
-	{
-		.value = SNIFF_CHANGE_FLAG_RESET_DEASSERT,
-		.str = "reset de-asserted",
-	},
-	{
-		.value = SNIFF_CHANGE_FLAG_TIMEOUT_WT,
-		.str = "data transfer timeout",
-	},
-	{
-		.value = 0,
-		.str = NULL,
-	},
+	{ SNIFF_CHANGE_FLAG_CARD_INSERT, "card inserted" },
+	{ SNIFF_CHANGE_FLAG_CARD_EJECT, "card ejected" },
+	{ SNIFF_CHANGE_FLAG_RESET_ASSERT, "reset asserted" },
+	{ SNIFF_CHANGE_FLAG_RESET_DEASSERT, "reset de-asserted" },
+	{ SNIFF_CHANGE_FLAG_TIMEOUT_WT, "data transfer timeout" },
+	{ 0, NULL }
 };
 
 const struct value_string data_flags[] = {
-	{
-		.value = SNIFF_DATA_FLAG_ERROR_INCOMPLETE,
-		.str = "incomplete",
-	},
-	{
-		.value = SNIFF_DATA_FLAG_ERROR_MALFORMED,
-		.str = "malformed",
-	},
-	{
-		.value = SNIFF_DATA_FLAG_ERROR_CHECKSUM,
-		.str = "checksum error",
-	},
-	{
-		.value = 0,
-		.str = NULL,
-	},
+	{ SNIFF_DATA_FLAG_ERROR_INCOMPLETE, "incomplete" },
+	{ SNIFF_DATA_FLAG_ERROR_MALFORMED, "malformed" },
+	{ SNIFF_DATA_FLAG_ERROR_CHECKSUM, "checksum error" },
+	{ 0, NULL }
 };
 
 static void print_flags(const struct value_string* flag_meanings, uint32_t nb_flags, uint32_t flags) {