]> sigrok.org Git - libsigrok.git/commitdiff
Fix warnings.
authorUwe Hermann <redacted>
Sun, 16 Jan 2011 13:18:26 +0000 (14:18 +0100)
committerUwe Hermann <redacted>
Sun, 16 Jan 2011 13:18:26 +0000 (14:18 +0100)
hardware/demo/demo.c
output/output_ols.c

index 5227b800fdbf000238d5457b03fb319bd8cd3573..15dd218f8c948537dccb114420a4a0eb0fa1db08 100644 (file)
@@ -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);
index b268866f989493f1c36357209a2d8bf837f225b4..a288ad50210fb312d99f91b88347b2b74741aad1 100644 (file)
@@ -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;