Move FORMAT parsing into send code.

This commit is contained in:
Ian Gulliver
2016-03-08 12:22:46 -08:00
parent d5eb4a919e
commit cd302a1746
8 changed files with 37 additions and 38 deletions

View File

@@ -4,8 +4,6 @@
#include <stdio.h>
#include <string.h>
#include "send.h"
#include "opts.h"
#define OPTS_MAX 128
@@ -22,21 +20,6 @@ static int opts_argc;
static char **opts_argv;
static opts_group opts_group_internal;
static struct serializer *opts_get_serializer(const char **arg) {
char *format = opts_split(arg, '=');
if (!format) {
return NULL;
}
struct serializer *serializer = send_get_serializer(format);
free(format);
if (!serializer) {
return NULL;
}
return serializer;
}
static void opts_print_usage() {
fprintf(stderr,
"Usage: %s [OPTION]...\n"
@@ -111,11 +94,3 @@ char *opts_split(const char **arg, char delim) {
*arg = split + 1;
return ret;
}
bool opts_add_send(bool (*next)(const char *, struct flow *, void *), struct flow *flow, const char *arg) {
struct serializer *serializer = opts_get_serializer(&arg);
if (!serializer) {
return false;
}
return next(arg, flow, serializer);
}