BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output_binary: Code simplifications.

This commit is contained in:
Uwe Hermann 2010-05-09 15:11:47 +02:00
parent 1e32053cd0
commit d20ba6490a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
output/output_binary.c
View File

@ -24,20 +24,18 @@
#include <sigrok.h> #include <sigrok.h>
#include "config.h" #include "config.h"
static int event(struct output *o, int event_type, char **data_out, static int event(struct output *o, int event_type, char **data_out,
uint64_t *length_out) uint64_t *length_out)
{ {
/* Prevent compiler warnings. */ /* Prevent compiler warnings. */
o = o; o = o;
event_type = event_type;
data_out = data_out;
switch (event_type) { switch (event_type) {
case DF_TRIGGER: case DF_TRIGGER:
/* TODO? Ignore? */
break; break;
case DF_END: case DF_END:
*data_out = NULL;
*length_out = 0; *length_out = 0;
break; 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, static int data(struct output *o, char *data_in, uint64_t length_in,
char **data_out, uint64_t *length_out) char **data_out, uint64_t *length_out)
{ {
uint64_t outsize;
char *outbuf; char *outbuf;
/* Prevent compiler warnings. */ /* Prevent compiler warnings. */
o = o; o = o;
outsize = length_in; if (!(outbuf = calloc(1, length_in)))
outbuf = calloc(1, outsize);
if (outbuf == NULL)
return SIGROK_ERR_MALLOC; return SIGROK_ERR_MALLOC;
memcpy(outbuf, data_in, length_in); memcpy(outbuf, data_in, length_in);
*data_out = outbuf; *data_out = outbuf;
*length_out = outsize; *length_out = length_in;
return SIGROK_OK; return SIGROK_OK;
} }