#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
#include "text.h"
-
-int init_ascii(struct sr_output *o)
+SR_PRIV int init_ascii(struct sr_output *o)
{
return init(o, DEFAULT_BPL_ASCII, MODE_ASCII);
}
-int data_ascii(struct sr_output *o, const 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;
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;
}
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;
return SR_OK;
}
-
-struct sr_output_format output_text_ascii = {
- "ascii",
- "ASCII (takes argument, default 74)",
- SR_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,
};
-