projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Do not leak buffer tree node on exit.
[paraslash.git]
/
filter.c
diff --git
a/filter.c
b/filter.c
index bf428b36dbc7668ccd2ac139117c7eb8d7d73ec0..0dfc94b1cc7213e024f6bc626c48be79cb09df75 100644
(file)
--- a/
filter.c
+++ b/
filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-20
09
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-20
11
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-20,6
+20,7
@@
#include "stdin.h"
#include "stdout.h"
#include "error.h"
#include "stdin.h"
#include "stdout.h"
#include "error.h"
+#include "version.h"
/** The list of all status items used by para_{server,audiod,gui}. */
const char *status_item_list[] = {STATUS_ITEM_ARRAY};
/** The list of all status items used by para_{server,audiod,gui}. */
const char *status_item_list[] = {STATUS_ITEM_ARRAY};
@@
-116,7
+117,8
@@
int main(int argc, char *argv[])
ret = parse_config(argc, argv);
if (ret < 0)
goto out;
ret = parse_config(argc, argv);
if (ret < 0)
goto out;
- sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
+ sit->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdin"));
stdin_set_defaults(sit);
register_task(&sit->task);
stdin_set_defaults(sit);
register_task(&sit->task);
@@
-135,14
+137,17
@@
int main(int argc, char *argv[])
f = filters + fn->filter_num;
sprintf(fn->task.status, "%s", f->name);
PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
f = filters + fn->filter_num;
sprintf(fn->task.status, "%s", f->name);
PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
- fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+ fn->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = f->name, .parent = parent,
+ .handler = f->execute, .context = fn));
fn->task.pre_select = f->pre_select;
fn->task.post_select = f->post_select;
f->open(fn);
register_task(&fn->task);
parent = fn->btrn;
}
fn->task.pre_select = f->pre_select;
fn->task.post_select = f->post_select;
f->open(fn);
register_task(&fn->task);
parent = fn->btrn;
}
- sot->btrn = btr_new_node("stdout", parent, NULL, NULL);
+ sot->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = "stdout", .parent = parent));
stdout_set_defaults(sot);
register_task(&sot->task);
stdout_set_defaults(sot);
register_task(&sot->task);
@@
-155,7
+160,8
@@
out_cleanup:
struct filter_node *fn = fns[i];
f = filters + fn->filter_num;
struct filter_node *fn = fns[i];
f = filters + fn->filter_num;
- f->close(fn);
+ if (f->close)
+ f->close(fn);
btr_free_node(fn->btrn);
free(fn->conf);
free(fn);
btr_free_node(fn->btrn);
free(fn->conf);
free(fn);