From: Gerhard Sittig <redacted>
Date: Sun, 23 Oct 2016 10:12:33 +0000 (+0200)
Subject: output/wav: fixup coding style nits, adjust data types
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=972398f471696e6c8995f7066d6f5a4a1d2b3552;p=libsigrok.git

output/wav: fixup coding style nits, adjust data types

Fixup unbalanced braces for more complex if statements, to better
reflect the project's official coding style.

Adjust data types in the float_to_le() routine. A float value gets
copied to a buffer of bytes (uint8_t). Don't use 'char' on the other
side of assignments, to not assume a specific width for char, and to
avoid potential signedness issues. Copy from bytes to bytes instead.
---

diff --git a/src/output/wav.c b/src/output/wav.c
index 79ea31e2..e3e4a9f3 100644
--- a/src/output/wav.c
+++ b/src/output/wav.c
@@ -186,9 +186,9 @@ static GString *gen_header(const struct sr_output *o)
  */
 static void float_to_le(uint8_t *buf, float value)
 {
-	char *old;
+	uint8_t *old;
 
-	old = (char *)&value;
+	old = (uint8_t *)&value;
 #ifdef WORDS_BIGENDIAN
 	buf[0] = old[3];
 	buf[1] = old[2];
@@ -219,9 +219,10 @@ static int check_chanbuf_size(const struct sr_output *o)
 				/* Nothing in all the buffers yet. */
 				size = -1;
 				break;
-			} else
+			} else {
 				/* New high water mark. */
 				size = outc->chanbuf_used[i];
+			}
 		} else if (outc->chanbuf_used[i] != size) {
 			/* All channel buffers are not equally full yet. */
 			size = -1;
@@ -265,8 +266,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		if (!outc->header_done) {
 			*out = gen_header(o);
 			outc->header_done = TRUE;
-		} else
+		} else {
 			*out = g_string_sized_new(512);
+		}
 
 		analog = packet->payload;
 		num_samples = analog->num_samples;