input/output formats: Explicit struct member names.

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

diff --git a/output/text/hex.c b/output/text/hex.c
index cd769aa53c94bc11705c84a60895755a881e1d4e..e4806355b371b6519f93cf7e296388dece019669 100644 (file)
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -24,14 +24,13 @@
 #include <sigrok.h>
 #include "text.h"
 
-
 int init_hex(struct sr_output *o)
 {
        return init(o, DEFAULT_BPL_HEX, MODE_HEX);
 }
 
-int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
-                   char **data_out, uint64_t *length_out)
+int data_hex(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_hex(struct sr_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 / 2;
        outsize = length_in / ctx->unitsize * ctx->num_enabled_probes
                        / ctx->samples_per_line * max_linelen + 512;
@@ -90,13 +89,11 @@ int data_hex(struct sr_output *o, char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
-
 struct sr_output_format output_text_hex = {
-       "hex",
-       "Hexadecimal (takes argument, default 192)",
-       DF_LOGIC,
-       init_hex,
-       data_hex,
-       event,
+       .extension = "hex",
+       .description = "Hexadecimal (takes argument, default 192)",
+       .df_type = SR_DF_LOGIC,
+       .init = init_hex,
+       .data = data_hex,
+       .event = event,
 };
-