X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fraw_analog.c;h=68ac1c956fdefa6b4c200826507ed47f9b658b98;hb=b33606718cebd776723c18de0a17efbca2d69525;hp=9c7135f0622aacfd9a6b2177f3ce316f53d66bad;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index 9c7135f0..68ac1c95 100644
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -31,9 +31,9 @@
 #define LOG_PREFIX "input/raw_analog"
 
 /* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE 4096
-#define DEFAULT_NUM_CHANNELS  1
-#define DEFAULT_SAMPLERATE    0
+#define CHUNK_SIZE		4096
+#define DEFAULT_NUM_CHANNELS	1
+#define DEFAULT_SAMPLERATE	0
 
 struct context {
 	gboolean started;
@@ -105,7 +105,7 @@ static int init(struct sr_input *in, GHashTable *options)
 {
 	struct context *inc;
 	int num_channels;
-	char channelname[8];
+	char channelname[16];
 	const char *format;
 	int fmt_index;
 
@@ -130,7 +130,7 @@ static int init(struct sr_input *in, GHashTable *options)
 	in->priv = inc = g_malloc0(sizeof(struct context));
 
 	for (int i = 0; i < num_channels; i++) {
-		snprintf(channelname, 8, "CH%d", i + 1);
+		snprintf(channelname, sizeof(channelname) - 1, "CH%d", i + 1);
 		sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
 	}
 
@@ -271,8 +271,8 @@ static int reset(struct sr_input *in)
 {
 	struct context *inc = in->priv;
 
-	cleanup(in);
 	inc->started = FALSE;
+	cleanup(in);
 	g_string_truncate(in->buf, 0);
 
 	return SR_OK;