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

json.reserve: fix compatability with libjansson 2.10

Browse source
This commit is contained in:
Steffen Vogel 2018-05-23 16:41:06 +02:00
parent 78ff84eef1
commit e3ee361c07
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/formats/json_reserve.c
View file

@ -62,19 +62,28 @@ static int json_reserve_pack_sample(struct io *io, json_t **j, struct sample *sm
json_unit = NULL;
}
json_value = json_pack_ex(&err, 0, "{ s: o, s: o*, s: f, s: o*, s: o* }",
json_value = json_pack_ex(&err, 0, "{ s: o, s: f }",
"name", json_name,
"unit", json_unit,
"value", smp->data[i].f,
"created", json_created,
"sequence", json_sequence
"value", smp->data[i].f
);
if (!json_value)
continue;
if (json_unit)
json_object_set(json_value, "unit", json_unit);
if (json_created)
json_object_set(json_value, "created", json_created);
if (json_sequence)
json_object_set(json_value, "sequence", json_sequence);
json_array_append(json_data, json_value);
}
if (json_created)
json_decref(json_created);
if (json_sequence)
json_decref(json_sequence);
char *origin, *target;
origin = smp->source
? smp->source->name
@ -84,14 +93,17 @@ static int json_reserve_pack_sample(struct io *io, json_t **j, struct sample *sm
? smp->destination->name
: NULL;
*j = json_pack_ex(&err, 0, "{ s: s*, s: s*, s: o }",
"origin", origin,
"target", target,
*j = json_pack_ex(&err, 0, "{ s: o }",
"measurements", json_data
);
if (*j == NULL)
return -1;
if (target)
json_object_set_new(*j, "target", json_string(target));
if (origin)
json_object_set_new(*j, "origin", json_string(origin));
return 0;
}