Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-16 00:00:02 +01:00
Code Issues Releases Wiki Activity

fix smaller merge errors

Browse source
This commit is contained in:
Steffen Vogel 2018-08-20 18:48:30 +02:00
parent 52492d47d1
commit df3b02b55f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/node.c
View file

@ -487,7 +487,7 @@ int node_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
char * node_name(struct node *n)
{
if (!n->_name)
strcatf(&n->_name, CLR_RED("%s") "(" CLR_YEL("%s") ")", n->name, node_type_name(n->vt)));
strcatf(&n->_name, CLR_RED("%s") "(" CLR_YEL("%s") ")", n->name, node_type_name(n->_vt));
return n->_name;
}

2
lib/nodes/file.c
View file

@ -301,7 +301,7 @@ int file_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
assert(cnt == 1);
retry: ret = io_scan(&f->io, smps, cnt);
if (ret = 0) {
if (ret <= 0) {
if (io_eof(&f->io)) {
switch (f->eof) {
case FILE_EOF_REWIND:

2
lib/super_node.c
View file

@ -449,7 +449,7 @@ int super_node_stop(struct super_node *sn)
if (p->type == PLUGIN_TYPE_NODE) {
ret = node_type_stop(&p->node);
if (ret)
error("Failed to stop node-type: %s", node_type_name(p));
error("Failed to stop node-type: %s", node_type_name(&p->node));
}
}