From 60e917fa7cb55b4f675110bae78df56cd49bd486 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Wed, 5 Jun 2019 11:56:11 +0200 Subject: src: dynamic input_descriptor allocation This patch introduces the input descriptor list, that stores the existing input descriptor objects. These objects are now dynamically allocated and release from scanner_destroy() path. Follow up patches that decouple the parsing and the evaluation phases require this for error reporting as described by b14572f72aac ("erec: Fix input descriptors for included files"), this patch partially reverts such partial. Signed-off-by: Pablo Neira Ayuso --- src/erec.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'src/erec.c') diff --git a/src/erec.c b/src/erec.c index cf543a98..c550a596 100644 --- a/src/erec.c +++ b/src/erec.c @@ -34,50 +34,17 @@ static const char * const error_record_names[] = { [EREC_ERROR] = "Error" }; -static void input_descriptor_destroy(const struct input_descriptor *indesc) -{ - if (indesc->location.indesc && - indesc->location.indesc->type != INDESC_INTERNAL) { - input_descriptor_destroy(indesc->location.indesc); - } - if (indesc->name) - xfree(indesc->name); - xfree(indesc); -} - -static struct input_descriptor *input_descriptor_dup(const struct input_descriptor *indesc) -{ - struct input_descriptor *dup_indesc; - - dup_indesc = xmalloc(sizeof(struct input_descriptor)); - *dup_indesc = *indesc; - - if (indesc->location.indesc && - indesc->location.indesc->type != INDESC_INTERNAL) - dup_indesc->location.indesc = input_descriptor_dup(indesc->location.indesc); - - if (indesc->name) - dup_indesc->name = xstrdup(indesc->name); - - return dup_indesc; -} - void erec_add_location(struct error_record *erec, const struct location *loc) { assert(erec->num_locations < EREC_LOCATIONS_MAX); erec->locations[erec->num_locations] = *loc; - erec->locations[erec->num_locations].indesc = input_descriptor_dup(loc->indesc); + erec->locations[erec->num_locations].indesc = loc->indesc; erec->num_locations++; } void erec_destroy(struct error_record *erec) { - unsigned int i; - xfree(erec->msg); - for (i = 0; i < erec->num_locations; i++) { - input_descriptor_destroy(erec->locations[i].indesc); - } xfree(erec); } -- cgit v1.2.3