summaryrefslogtreecommitdiffstats
path: root/grammar/rainerscript.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-04 11:06:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-04 11:06:25 +0200
commitaa8c79794e00c42ef3b89753f38cef511abb90b3 (patch)
tree93ddacb7e0d3e4075e0c8074928382588bea9d2a /grammar/rainerscript.c
parent493ddeaa770de41ab5a6bb5279eed355c84b12ee (diff)
parentddea340e665a657bc6be88176130d1221c0dec3d (diff)
downloadrsyslog-aa8c79794e00c42ef3b89753f38cef511abb90b3.tar.gz
rsyslog-aa8c79794e00c42ef3b89753f38cef511abb90b3.tar.bz2
rsyslog-aa8c79794e00c42ef3b89753f38cef511abb90b3.zip
Merge branch 'master' into master-newruleset
Diffstat (limited to 'grammar/rainerscript.c')
-rw-r--r--grammar/rainerscript.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
index d9812fee..2d5bbd9b 100644
--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
@@ -138,7 +138,7 @@ objlstDestruct(struct objlst *lst)
while(lst != NULL) {
toDel = lst;
lst = lst->next;
- // TODO: delete object
+ cnfobjDestruct(toDel->obj);
free(toDel);
}
}
@@ -647,6 +647,7 @@ cnfobjDestruct(struct cnfobj *o)
{
if(o != NULL) {
nvlstDestruct(o->nvlst);
+ objlstDestruct(o->subobjs);
free(o);
}
}