sr: moved sigrok.h so libsigrok/libsigrok.h

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

diff --git a/output/text/hex.c b/output/text/hex.c
index e604d9735f76a04ae2ec1b5270b5128c50b66f8f..9477a7b58e380e38569cc834a72c2c4e58d2f8f6 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2011 Håvard Espeland <gus@ping.uio.no>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -21,22 +21,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include <sigrok.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 #include "text.h"
 
-int init_hex(struct sr_output *o)
+SR_PRIV int init_hex(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
-            char **data_out, uint64_t *length_out)
+SR_PRIV int data_hex(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;
+       uint8_t *outbuf;
 
        ctx = o->internal;
        max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
@@ -44,14 +46,16 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
        outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
                        / ctx->samples_per_line * max_linelen + 512;
 
-       if (!(outbuf = calloc(1, outsize + 1)))
+       if (!(outbuf = g_try_malloc0(outsize + 1))) {
+               sr_err("hex out: %s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
+       }
 
        outbuf[0] = '\0';
        if (ctx->header) {
                /* The header is still here, this must be the first packet. */
-               strncpy(outbuf, ctx->header, outsize);
-               free(ctx->header);
+               strncpy((char *)outbuf, ctx->header, outsize);
+               g_free(ctx->header);
                ctx->header = NULL;
        }
 
@@ -63,7 +67,7 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
                        ctx->linevalues[p] <<= 1;
                        if (sample & ((uint64_t) 1 << p))
                                ctx->linevalues[p] |= 1;
-                       sprintf(ctx->linebuf + (p * ctx->linebuf_len) +
+                       sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
                                ctx->line_offset, "%.2x", ctx->linevalues[p]);
                }
                ctx->spl_cnt++;
@@ -84,14 +88,14 @@ int data_hex(struct sr_output *o, const char *data_in, uint64_t length_in,
        }
 
        *data_out = outbuf;
-       *length_out = strlen(outbuf);
+       *length_out = strlen((const char *)outbuf);
 
        return SR_OK;
 }
 
-struct sr_output_format output_text_hex = {
+SR_PRIV struct sr_output_format output_text_hex = {
        .id = "hex",
-       .description = "Hexadecimal (takes argument, default 192)",
+       .description = "Hexadecimal",
        .df_type = SR_DF_LOGIC,
        .init = init_hex,
        .data = data_hex,