From: Uwe Hermann <redacted>
Date: Sun, 16 Jan 2011 13:18:26 +0000 (+0100)
Subject: Fix warnings.
X-Git-Tag: libsigrok-0.1.0~420
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=10c471ab131bd766c9207e05e485fd2467ba7d5b;p=libsigrok.git

Fix warnings.
---

diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c
index 5227b800..15dd218f 100644
--- a/hardware/demo/demo.c
+++ b/hardware/demo/demo.c
@@ -253,7 +253,7 @@ static void thread_func(void *data)
 		mydata->samples_counter += nb_to_send;
 
 		g_io_channel_write_chars(channels[1], (gchar *)&buf,
-					 nb_to_send, &bytes_written, NULL);
+				nb_to_send, (gsize *)&bytes_written, NULL);
 
 		g_usleep(mydata->loop_sleep);
 	}
@@ -267,6 +267,7 @@ static int receive_data(int fd, int revents, void *user_data)
 	uint64_t z;
 
 	/* Avoid compiler warnings. */
+	fd = fd;
 	revents = revents;
 
 	g_io_channel_read_chars(channels[0], (gchar *)&c, BUFSIZE, &z, NULL);
diff --git a/output/output_ols.c b/output/output_ols.c
index b268866f..a288ad50 100644
--- a/output/output_ols.c
+++ b/output/output_ols.c
@@ -181,7 +181,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 		char **data_out, uint64_t *length_out)
 {
 	struct context *ctx;
-	unsigned int max_linelen, outsize, p, curbit, i;
+	unsigned int max_linelen, outsize, i;
 	uint64_t sample;
 	static uint64_t samplecount = 0;
 	char *outbuf, *c;