X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Ftext%2Fascii.c;h=b8dad68edc19e2e92290a3b6f05b344f11f7a202;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=27f5d74217e0fc19fa61f6566770831d43a5b98d;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git diff --git a/output/text/ascii.c b/output/text/ascii.c index 27f5d742..b8dad68e 100644 --- a/output/text/ascii.c +++ b/output/text/ascii.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2011 Bert Vermeulen + * Copyright (C) 2010-2012 Bert Vermeulen * Copyright (C) 2011 HÃ¥vard Espeland * * This program is free software: you can redistribute it and/or modify @@ -21,17 +21,18 @@ #include #include #include -#include +#include "sigrok.h" +#include "sigrok-internal.h" #include "text.h" - -int init_ascii(struct output *o) +SR_PRIV 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) +SR_PRIV 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 +41,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 @@ -49,14 +50,16 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in, outsize = 512 + (1 + (length_in / ctx->unitsize) / ctx->samples_per_line) * (ctx->num_enabled_probes * max_linelen); - if (!(outbuf = calloc(1, outsize + 1))) + if (!(outbuf = g_try_malloc0(outsize + 1))) { + sr_err("ascii 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); + g_free(ctx->header); ctx->header = NULL; } @@ -105,7 +108,7 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in, ctx->prevsample = sample; } } else { - g_message("short buffer (length_in=%" PRIu64 ")", length_in); + sr_info("short buffer (length_in=%" PRIu64 ")", length_in); } *data_out = outbuf; @@ -114,13 +117,11 @@ int data_ascii(struct output *o, char *data_in, uint64_t length_in, return SR_OK; } - -struct output_format output_text_ascii = { - "ascii", - "ASCII (takes argument, default 74)", - DF_LOGIC, - init_ascii, - data_ascii, - event, +SR_PRIV struct sr_output_format output_text_ascii = { + .id = "ascii", + .description = "ASCII (takes argument, default 74)", + .df_type = SR_DF_LOGIC, + .init = init_ascii, + .data = data_ascii, + .event = event, }; -