From 2001c49d539137a720360c2341694f39bff18868 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 31 Aug 2017 11:31:09 +0200 Subject: [PATCH] mapping: default to node samplelen if now range for data mapping is given --- lib/mapping.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/mapping.c b/lib/mapping.c index d8fcb5da2..a441bbb49 100644 --- a/lib/mapping.c +++ b/lib/mapping.c @@ -27,6 +27,7 @@ #include "sample.h" #include "list.h" #include "utils.h" +#include "node.h" int mapping_parse_str(struct mapping_entry *e, const char *str, struct list *nodes) { @@ -158,7 +159,7 @@ int mapping_parse_str(struct mapping_entry *e, const char *str, struct list *nod } else { e->data.offset = 0; - e->length = 0; /* Length in unkown.. we will take all values */ + e->length = e->node->samplelen; } } else @@ -193,7 +194,7 @@ int mapping_parse(struct mapping_entry *e, json_t *j, struct list *nodes) int mapping_parse_list(struct list *l, json_t *cfg, struct list *nodes) { - int ret, off, len; + int ret, off; size_t i; json_t *json_entry; @@ -209,7 +210,6 @@ int mapping_parse_list(struct list *l, json_t *cfg, struct list *nodes) return -1; off = 0; - len = json_array_size(json_mapping); json_array_foreach(json_mapping, i, json_entry) { struct mapping_entry *e = alloc(sizeof(struct mapping_entry)); @@ -217,10 +217,6 @@ int mapping_parse_list(struct list *l, json_t *cfg, struct list *nodes) if (ret) return ret; - /* Variable length mapping entries are currently only supported as the last element in a mapping */ - if (e->length == 0 && i != len - 1) - return -1; - e->offset = off; off += e->length; @@ -359,4 +355,4 @@ int mapping_remap(struct list *m, struct sample *remapped, struct sample *origin } return 0; -} +} \ No newline at end of file