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

Merge branch 'more-various-fixes' into develop

Browse source
This commit is contained in:
Steffen Vogel 2017-07-22 13:01:50 +02:00
commit 28753933e0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -50,7 +50,7 @@ CFLAGS += -Wall -Werror -fdiagnostics-color=auto
LDFLAGS += -L$(BUILDDIR)
# Some tools
PKGCONFIG := PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:$(PKG_CONFIG_PATH) pkg-config
PKGCONFIG := PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:$(PKG_CONFIG_PATH) pkg-config
SHELL := bash
# We must compile without optimizations for gcov!

12
lib/log_table.c
View file

@ -102,9 +102,9 @@ void table_header(struct table *t)
free(col);
}
stats(line0);
stats(line1);
stats(line2);
stats("%s", line0);
stats("%s", line1);
stats("%s", line2);
free(line0);
free(line1);
@ -142,7 +142,7 @@ void table_row(struct table *t, ...)
va_end(args);
stats(line);
stats("%s", line);
free(line);
}
@ -165,6 +165,6 @@ void table_footer(struct table *t)
strcatf(&line, "%s", BOX_ULR);
}
stats(line);
stats("%s", line);
free(line);
}
}

2
lib/nodes/ngsi.c
View file

@ -241,7 +241,7 @@ static int ngsi_parse_mapping(struct list *mapping, config_setting_t *cfg)
.name = "index",
.type = "integer"
};
asprintf(&i.value, "%u", j);
assert(asprintf(&i.value, "%u", j));
list_push(&a->metadata, memdup(&s, sizeof(s)));
list_push(&a->metadata, memdup(&i, sizeof(i)));