From e20bd664d94b91f527847e151345db49d180b026 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 29 Jun 2023 06:07:26 +0000 Subject: [PATCH] Harmonize libjansson format strings Signed-off-by: Steffen Vogel --- lib/nodes/iec61850_goose.cpp | 6 +++--- lib/nodes/webrtc.cpp | 2 +- lib/nodes/webrtc/signaling_message.cpp | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/nodes/iec61850_goose.cpp b/lib/nodes/iec61850_goose.cpp index d680bd974..6209064e3 100644 --- a/lib/nodes/iec61850_goose.cpp +++ b/lib/nodes/iec61850_goose.cpp @@ -744,7 +744,7 @@ void GooseNode::parseOutput(json_t *json) json_t *json_publishers = nullptr; json_t *json_signals = nullptr; char const *interface_id = output.interface_id.c_str(); - ret = json_unpack_ex(json, &err, 0, "{ s:o, s:o, s?:s, s?:f }", + ret = json_unpack_ex(json, &err, 0, "{ s: o, s: o, s?: s, s?: f }", "publishers", &json_publishers, "signals", &json_signals, "interface", &interface_id, @@ -773,7 +773,7 @@ void GooseNode::parsePublisherData(json_t *json, std::vector &data) char const *signal_str = nullptr; json_t *json_value = nullptr; int bitstring_size = -1; - ret = json_unpack_ex(json_signal_or_value, &err, 0, "{ s:s, s?:s, s?:o, s?:i }", + ret = json_unpack_ex(json_signal_or_value, &err, 0, "{ s: s, s?: s, s?: o, s?: i }", "mms_type", &mms_type, "signal", &signal_str, "value", &json_value, @@ -824,7 +824,7 @@ void GooseNode::parsePublisher(json_t *json, PublisherConfig &pc) int time_allowed_to_live = 0; int burst = 1; json_t *json_data = nullptr; - ret = json_unpack_ex(json, &err, 0, "{ s:s, s:s, s:s, s:s, s:i, s:i, s:i, s?:i, s:o }", + ret = json_unpack_ex(json, &err, 0, "{ s: s, s: s, s: s, s: s, s: i, s: i, s: i, s?: i, s: o }", "go_id", &go_id, "go_cb_ref", &go_cb_ref, "data_set_ref", &data_set_ref, diff --git a/lib/nodes/webrtc.cpp b/lib/nodes/webrtc.cpp index 7baaa3994..e35934ce0 100644 --- a/lib/nodes/webrtc.cpp +++ b/lib/nodes/webrtc.cpp @@ -57,7 +57,7 @@ int WebRTCNode::parse(json_t *json, const uuid_t sn_uuid) json_t *json_format = nullptr; json_error_t err; - ret = json_unpack_ex(json, &err, 0, "{ s:s, s?:s, s?s, s?i, s?i, s?b, s?o }", + ret = json_unpack_ex(json, &err, 0, "{ s: s, s?: s, s?: s, s?: i, s?: i, s?: b, s?: o }", "session", &sess, "peer", &pr, "server", &svr, diff --git a/lib/nodes/webrtc/signaling_message.cpp b/lib/nodes/webrtc/signaling_message.cpp index d8dfeb993..068bd6bc5 100644 --- a/lib/nodes/webrtc/signaling_message.cpp +++ b/lib/nodes/webrtc/signaling_message.cpp @@ -19,7 +19,7 @@ using namespace villas::node::webrtc; json_t * Peer::toJson() const { - return json_pack("{ s:i, s:s*, s:s*, s:s* }", + return json_pack("{ s: i, s: s*, s: s*, s: s* }", "id", id, "name", name.empty() ? nullptr : name.c_str(), "remote", remote.empty() ? nullptr : remote.c_str(), @@ -32,7 +32,7 @@ Peer::Peer(json_t *json) { const char *nme = nullptr, *rem = nullptr, *ua = nullptr, *tscreat, *tsconn; - int ret = json_unpack(json, "{ s:i, s?:s, s?:s, s?:s, s?:s, s?: s }", + int ret = json_unpack(json, "{ s: i, s?: s, s?: s, s?: s, s?: s, s?: s }", "id", &id, "name", &nme, "remote", &rem, @@ -70,7 +70,7 @@ RelayMessage::RelayMessage(json_t *json) json_t *json_server; size_t i; json_array_foreach(json, i, json_server) { - ret = json_unpack(json_server, "{ s:s, s:s, s:s, s:s, s:s }", + ret = json_unpack(json_server, "{ s: s, s: s, s: s, s: s, s: s }", "url", &url, "user", &user, "pass", &pass, @@ -99,7 +99,7 @@ json_t * ControlMessage::toJson() const json_array_append_new(json_peers, json_peer); } - return json_pack("{ s:i, s:o }", + return json_pack("{ s: i, s: o }", "peer_id", peerID, "peers", json_peers ); @@ -111,7 +111,7 @@ ControlMessage::ControlMessage(json_t *j) json_t *json_peers; - ret = json_unpack(j, "{ s:i, s:o }", + ret = json_unpack(j, "{ s: i, s: o }", "peer_id", &peerID, "peers", &json_peers ); @@ -132,19 +132,19 @@ json_t * SignalingMessage::toJson() const { return std::visit(villas::utils::overloaded { [](ControlMessage const &c){ - return json_pack("{ s:o }", "control", c.toJson()); + return json_pack("{ s: o }", "control", c.toJson()); }, [](SignalList const &s){ - return json_pack("{ s:o }", "signals", s.toJson()); + return json_pack("{ s: o }", "signals", s.toJson()); }, [](rtc::Description const &d){ - return json_pack("{ s:{ s:s, s:s } }", "description", + return json_pack("{ s: { s: s, s: s } }", "description", "spd", d.generateSdp().c_str(), "type", d.typeString().c_str() ); }, [](rtc::Candidate const &c){ - return json_pack("{ s:{ s:s, s:s } }", "candidate", + return json_pack("{ s: { s: s, s: s } }", "candidate", "spd", c.candidate().c_str(), "mid", c.mid().c_str() ); @@ -196,7 +196,7 @@ SignalingMessage SignalingMessage::fromJson(json_t *json) const char *desc = nullptr; const char *typ = nullptr; - int ret = json_unpack(json, "{ s?o, s?o, s?o, s?{ s:s, s:s }, s?{ s:s, s:s } }", + int ret = json_unpack(json, "{ s?: o, s?: o, s?: o, s?: { s: s, s: s }, s?: { s: s, s: s } }", "servers", &rlys, "signals", &sigs, "control", &ctrl,