input/output formats: Explicit struct member names.

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

diff --git a/output/text/ascii.c b/output/text/ascii.c
index b9f08254a54b4fd4dfaba69f5c7146fd233c8404..4d1611fa2a6fbc5567a0f872eaae3c4644556f89 100644 (file)
--- a/output/text/ascii.c
+++ b/output/text/ascii.c
@@ -24,14 +24,13 @@
 #include <sigrok.h>
 #include "text.h"
 
-
-int init_ascii(struct output *o)
+int init_ascii(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
 }
 
-int data_ascii(struct output *o, char *data_in, uint64_t length_in,
-                    char **data_out, uint64_t *length_out)
+int data_ascii(struct sr_output *o, const char *data_in, uint64_t length_in,
+              char **data_out, uint64_t *length_out)
 {
        struct context *ctx;
        unsigned int outsize, offset, p;
@@ -40,7 +39,7 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in,
        char *outbuf;
 
        ctx = o->internal;
-       max_linelen = MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
+       max_linelen = SR_MAX_PROBENAME_LEN + 3 + ctx->samples_per_line
                        + ctx->samples_per_line / 8;
         /*
          * Calculate space needed for probes. Set aside 512 bytes for
@@ -50,7 +49,7 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in,
             * (ctx->num_enabled_probes * max_linelen);
 
        if (!(outbuf = calloc(1, outsize + 1)))
-               return SIGROK_ERR_MALLOC;
+               return SR_ERR_MALLOC;
 
        outbuf[0] = '\0';
        if (ctx->header) {
@@ -111,16 +110,14 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in,
        *data_out = outbuf;
        *length_out = strlen(outbuf);
 
-       return SIGROK_OK;
+       return SR_OK;
 }
 
-
-struct output_format output_text_ascii = {
-       "ascii",
-       "ASCII (takes argument, default 74)",
-       DF_LOGIC,
-       init_ascii,
-       data_ascii,
-       event,
+struct sr_output_format output_text_ascii = {
+       .extension = "ascii",
+       .description = "ASCII (takes argument, default 74)",
+       .df_type = SR_DF_LOGIC,
+       .init = init_ascii,
+       .data = data_ascii,
+       .event = event,
 };
-