From d20ba6490ac948783435c72340d3e37b67cd6a62 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sun, 9 May 2010 15:11:47 +0200 Subject: [PATCH] output_binary: Code simplifications. --- output/output_binary.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/output/output_binary.c b/output/output_binary.c index 80b1447f..2045a579 100644 --- a/output/output_binary.c +++ b/output/output_binary.c @@ -24,20 +24,18 @@ #include #include "config.h" - static int event(struct output *o, int event_type, char **data_out, uint64_t *length_out) { - /* Prevent compiler warnings. */ o = o; - event_type = event_type; - data_out = data_out; switch (event_type) { case DF_TRIGGER: + /* TODO? Ignore? */ break; case DF_END: + *data_out = NULL; *length_out = 0; break; } @@ -48,20 +46,17 @@ static int event(struct output *o, int event_type, char **data_out, static int data(struct output *o, char *data_in, uint64_t length_in, char **data_out, uint64_t *length_out) { - uint64_t outsize; char *outbuf; /* Prevent compiler warnings. */ o = o; - outsize = length_in; - outbuf = calloc(1, outsize); - if (outbuf == NULL) + if (!(outbuf = calloc(1, length_in))) return SIGROK_ERR_MALLOC; memcpy(outbuf, data_in, length_in); *data_out = outbuf; - *length_out = outsize; + *length_out = length_in; return SIGROK_OK; }