input/output formats: Explicit struct member names.

[libsigrok.git] / output / output_binary.c

diff --git a/output/output_binary.c b/output/output_binary.c
index 41a8caee721ec04cb2eefec58285f9537c9311b9..fb7c3f588c103a3a3f232f091b281ee850e85210 100644 (file)
--- a/output/output_binary.c
+++ b/output/output_binary.c
@@ -24,26 +24,7 @@
 #include <sigrok.h>
 #include "config.h"
 
-static int event(struct output *o, int event_type, char **data_out,
-                uint64_t *length_out)
-{
-       /* Prevent compiler warnings. */
-       o = o;
-
-       switch (event_type) {
-       case DF_TRIGGER:
-               /* TODO? Ignore? */
-               break;
-       case DF_END:
-               *data_out = NULL;
-               *length_out = 0;
-               break;
-       }
-
-       return SIGROK_OK;
-}
-
-static int data(struct output *o, char *data_in, uint64_t length_in,
+static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                char **data_out, uint64_t *length_out)
 {
        char *outbuf;
@@ -52,20 +33,20 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
        o = o;
 
        if (!(outbuf = calloc(1, length_in)))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        memcpy(outbuf, data_in, length_in);
        *data_out = outbuf;
        *length_out = length_in;
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-struct output_format output_binary = {
-       "binary",
-       "Raw binary",
-       DF_LOGIC,
-       NULL,
-       data,
-       event,
+struct sr_output_format output_binary = {
+       .extension = "binary",
+       .description = "Raw binary",
+       .df_type = SR_DF_LOGIC,
+       .init = NULL,
+       .data = data,
+       .event = NULL,
 };