sr: cosmetic changes

[libsigrok.git] / output / text / bits.c

diff --git a/output/text/bits.c b/output/text/bits.c
index ffaf30d6faa387946623f0d82326b4eb09058829..c1dbd2f81502ca67cb185672cea75dc113eda35f 100644 (file)
--- a/output/text/bits.c
+++ b/output/text/bits.c
@@ -21,8 +21,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
 SR_PRIV int init_bits(struct sr_output *o)
@@ -30,14 +30,15 @@ SR_PRIV int init_bits(struct sr_output *o)
        return init(o, DEFAULT_BPL_BITS, MODE_BITS);
 }
 
-SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
-                     uint64_t length_in, char **data_out, uint64_t *length_out)
+SR_PRIV int data_bits(struct sr_output *o, const uint8_t *data_in,
+                     uint64_t length_in, uint8_t **data_out,
+                     uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
        int max_linelen;
        uint64_t sample;
-       char *outbuf, c;
+       uint8_t *outbuf, c;
 
        ctx = o->internal;
        max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@@ -57,7 +58,7 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
        outbuf[0] = '\0';
        if (ctx->header) {
                /* The header is still here, this must be the first packet. */
-               strncpy(outbuf, ctx->header, outsize);
+               strncpy((char *)outbuf, ctx->header, outsize);
                g_free(ctx->header);
                ctx->header = NULL;
 
@@ -94,18 +95,19 @@ SR_PRIV int data_bits(struct sr_output *o, const char *data_in,
                        }
                }
        } else {
-               sr_info("short buffer (length_in=%" PRIu64 ")", length_in);
+               sr_info("bits out: short buffer (length_in=%" PRIu64 ")",
+                       length_in);
        }
 
        *data_out = outbuf;
-       *length_out = strlen(outbuf);
+       *length_out = strlen((const char *)outbuf);
 
        return SR_OK;
 }
 
 SR_PRIV struct sr_output_format output_text_bits = {
        .id = "bits",
-       .description = "Bits (takes argument, default 64)",
+       .description = "Bits",
        .df_type = SR_DF_LOGIC,
        .init = init_bits,
        .data = data_bits,