diff --git a/include/villas/sample.h b/include/villas/sample.h index 7c4c4fc36..302cedef5 100644 --- a/include/villas/sample.h +++ b/include/villas/sample.h @@ -102,7 +102,7 @@ struct sample { struct sample * sample_alloc(struct pool *p); /** Allocate a new sample from the heap. */ -struct sample * sample_alloc_mem(int capacity); +struct sample * sample_alloc_heap(int capacity); /** Allocate a new sample from the same pool as \p smp and copy its content */ struct sample * sample_clone(struct sample *smp); diff --git a/lib/nodes/file.cpp b/lib/nodes/file.cpp index 239719f7b..89d29bc93 100644 --- a/lib/nodes/file.cpp +++ b/lib/nodes/file.cpp @@ -321,7 +321,7 @@ int file_start(struct vnode *n) rewind(f->stream_in); /* Fast-forward */ - struct sample *smp = sample_alloc_mem(vlist_length(&n->in.signals)); + struct sample *smp = sample_alloc_heap(vlist_length(&n->in.signals)); for (unsigned i = 0; i < f->skip_lines; i++) f->formatter->scan(f->stream_in, smp); diff --git a/lib/sample.cpp b/lib/sample.cpp index 4532da697..2e8c73f70 100644 --- a/lib/sample.cpp +++ b/lib/sample.cpp @@ -62,7 +62,7 @@ struct sample * sample_alloc(struct pool *p) return s; } -struct sample * sample_alloc_mem(int capacity) +struct sample * sample_alloc_heap(int capacity) { size_t sz = SAMPLE_LENGTH(capacity); diff --git a/src/villas-convert.cpp b/src/villas-convert.cpp index e11334794..751ca9be8 100644 --- a/src/villas-convert.cpp +++ b/src/villas-convert.cpp @@ -143,7 +143,7 @@ protected: dirs[i].formatter->start(dtypes); } - struct sample *smp = sample_alloc_mem(DEFAULT_SAMPLE_LENGTH); + struct sample *smp = sample_alloc_heap(DEFAULT_SAMPLE_LENGTH); while (true) { ret = dirs[0].formatter->scan(stdin, smp);