projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Always set *dbp to null on failure in ovsdb_file_open__().
[openvswitch]
/
lib
/
jsonrpc.c
diff --git
a/lib/jsonrpc.c
b/lib/jsonrpc.c
index 562a2870056956edfb8b4e46535e929eb1a9e3a8..5c7dfca9ef85e4cb34c60ca8b8a85eb06d15cb34 100644
(file)
--- a/
lib/jsonrpc.c
+++ b/
lib/jsonrpc.c
@@
-152,19
+152,19
@@
jsonrpc_log_msg(const struct jsonrpc *rpc, const char *title,
}
if (msg->params) {
ds_put_cstr(&s, ", params=");
}
if (msg->params) {
ds_put_cstr(&s, ", params=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->params, 0)
);
+
json_to_ds(msg->params, 0, &s
);
}
if (msg->result) {
ds_put_cstr(&s, ", result=");
}
if (msg->result) {
ds_put_cstr(&s, ", result=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->result, 0)
);
+
json_to_ds(msg->result, 0, &s
);
}
if (msg->error) {
ds_put_cstr(&s, ", error=");
}
if (msg->error) {
ds_put_cstr(&s, ", error=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->error, 0)
);
+
json_to_ds(msg->error, 0, &s
);
}
if (msg->id) {
ds_put_cstr(&s, ", id=");
}
if (msg->id) {
ds_put_cstr(&s, ", id=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->id, 0)
);
+
json_to_ds(msg->id, 0, &s
);
}
VLOG_DBG("%s: %s %s%s", rpc->name, title,
jsonrpc_msg_type_to_string(msg->type), ds_cstr(&s));
}
VLOG_DBG("%s: %s %s%s", rpc->name, title,
jsonrpc_msg_type_to_string(msg->type), ds_cstr(&s));