From 4b2d4fe603083a1e295d391c24d9a45d6baa42d7 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 7 Mar 2017 07:20:49 -0400 Subject: [PATCH] smaller bugfixes --- include/villas/nodes/cbuilder.h | 2 -- lib/nodes/cbuilder.c | 2 +- lib/plugin.c | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/villas/nodes/cbuilder.h b/include/villas/nodes/cbuilder.h index fb2675ed8..cb83ced7f 100644 --- a/include/villas/nodes/cbuilder.h +++ b/include/villas/nodes/cbuilder.h @@ -21,8 +21,6 @@ struct cbuilder; struct cbuilder_model { - char *name; - void (*code)(); void (*ram)(); diff --git a/lib/nodes/cbuilder.c b/lib/nodes/cbuilder.c index 041a7e2f4..98d70ec5c 100644 --- a/lib/nodes/cbuilder.c +++ b/lib/nodes/cbuilder.c @@ -123,7 +123,7 @@ static struct plugin p = { .open = cbuilder_open, .close = cbuilder_close, .read = cbuilder_read, - .write = cbuilder_write, + .write = cbuilder_write } }; diff --git a/lib/plugin.c b/lib/plugin.c index 556e7e378..4ac431457 100644 --- a/lib/plugin.c +++ b/lib/plugin.c @@ -52,9 +52,9 @@ int plugin_destroy(struct plugin *p) { if (p->state == PLUGIN_STATE_LOADED) plugin_unload(p); - - free(p->name); - free(p->path); + + if (p->path) + free(p->path); return 0; }