build: Portability fixes.

[libsigrok.git] / output / binary.c

diff --git a/output/binary.c b/output/binary.c
index 039d10bcea3d09428fafc29cc47ea2c39466ffa6..6e2531d1a252af1e7a92ed63e14c0b2783c0824f 100644 (file)
--- a/output/binary.c
+++ b/output/binary.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -21,50 +21,29 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "sigrok.h"
-#include "sigrok-internal.h"
-#include "config.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
 
-static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
-               char **data_out, uint64_t *length_out)
+#define LOG_PREFIX "output/binary"
+
+static int receive(struct sr_output *o, const struct sr_datafeed_packet *packet,
+               GString **out)
 {
-       char *outbuf;
+       const struct sr_datafeed_logic *logic;
 
-       /* Prevent compiler warnings. */
        (void)o;
 
-       if (!data_in) {
-               sr_warn("binary output: %s: data_in was NULL", __func__);
-               return SR_ERR;
-       }
-
-       if (!length_out) {
-               sr_warn("binary output: %s: length_out was NULL", __func__);
-               return SR_ERR;
-       }
-
-       if (length_in == 0) {
-               sr_warn("binary output: %s: length_in was 0", __func__);
-               return SR_ERR;
-       }
-
-       if (!(outbuf = calloc(1, length_in))) {
-               sr_warn("binary output: %s: outbuf calloc failed", __func__);
-               return SR_ERR_MALLOC;
-       }
-
-       memcpy(outbuf, data_in, length_in);
-       *data_out = outbuf;
-       *length_out = length_in;
+       *out = NULL;
+       if (packet->type != SR_DF_LOGIC)
+               return SR_OK;
+       logic = packet->payload;
+       *out = g_string_new_len(logic->data, logic->length);
 
        return SR_OK;
 }
 
-struct sr_output_format output_binary = {
+SR_PRIV struct sr_output_format output_binary = {
        .id = "binary",
        .description = "Raw binary",
-       .df_type = SR_DF_LOGIC,
-       .init = NULL,
-       .data = data,
-       .event = NULL,
+       .receive = receive,
 };