From a74644cea9b22d4250bcaf244c3421cde656894e Mon Sep 17 00:00:00 2001 From: Sonja Kolen Date: Wed, 1 Aug 2018 16:45:54 +0200 Subject: [PATCH] csv and villas.human formats: remove dynamic memory allocation --- lib/formats/csv.c | 3 +-- lib/formats/villas_human.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/formats/csv.c b/lib/formats/csv.c index e878696a6..93891cf5e 100644 --- a/lib/formats/csv.c +++ b/lib/formats/csv.c @@ -113,7 +113,7 @@ static size_t csv_sscan_single(struct io *io, const char *buf, size_t len, struc next_seperator = strchr(ptr, io->delimiter); } - char *number = malloc(next_seperator - ptr); + char number[100]; strncpy(number, ptr, next_seperator-ptr); char * contains_dot = strstr(number, "."); if(contains_dot == NULL){ @@ -127,7 +127,6 @@ static size_t csv_sscan_single(struct io *io, const char *buf, size_t len, struc s->data[s->length].f = strtod(ptr, &end); sample_set_data_format(s, s->length, SAMPLE_DATA_FORMAT_FLOAT); } - free(number); /* There are no valid values anymore. */ diff --git a/lib/formats/villas_human.c b/lib/formats/villas_human.c index ffebe20fd..a23faebbf 100644 --- a/lib/formats/villas_human.c +++ b/lib/formats/villas_human.c @@ -138,7 +138,7 @@ static size_t villas_human_sscan_single(struct io *io, const char *buf, size_t l next_seperator = strchr(ptr, io->delimiter); } - char *number = malloc(next_seperator - ptr); + char number[100]; strncpy(number, ptr, next_seperator-ptr); char * contains_dot = strstr(number, "."); if(contains_dot == NULL){ @@ -152,7 +152,6 @@ static size_t villas_human_sscan_single(struct io *io, const char *buf, size_t l s->data[s->length].f = strtod(ptr, &end); sample_set_data_format(s, s->length, SAMPLE_DATA_FORMAT_FLOAT); } - free(number); /* There are no valid values anymore. */ if (end == ptr)