From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 31 Oct 2019 16:33:00 +0000 (+0100)
Subject: amixer: do not double LF for container type
X-Git-Tag: v1.2.1~5
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=5828279b5d14db7332802fe81aed65a24a67d7a3;p=alsa-utils.git

amixer: do not double LF for container type

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 9c3f9bf..ad9c482 100644
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -453,6 +453,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 	unsigned int size;
 	unsigned int idx = 0;
 	const char *chmap_type = NULL;
+	int lf = 1;
 
 	if (tlv_size < 2 * sizeof(unsigned int)) {
 		printf("TLV size error!\n");
@@ -480,6 +481,7 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 			decode_tlv(spaces + 2, tlv + idx, tlv[idx+1] + 8);
 			idx += 2 + (tlv[idx+1] + sizeof(unsigned int) - 1) / sizeof(unsigned int);
 		}
+		lf = 0;
 		break;
 	case SND_CTL_TLVT_DB_SCALE:
 		printf("dBscale-");
@@ -581,7 +583,8 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
 		}
 		break;
 	}
-	putc('\n', stdout);
+	if (lf)
+		putc('\n', stdout);
 }
 
 static int show_control(const char *space, snd_hctl_elem_t *elem,