mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
fix smaller merge errors
This commit is contained in:
parent
52492d47d1
commit
df3b02b55f
3 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue