{"id":815882,"url":"http://patchwork.ozlabs.org/api/patches/815882/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-16-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919220125.32535-16-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:00:48","name":"[ovs-dev,RFC,15/52] ovsdb-error: New function ovsdb_error_to_json_free().","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"a5899073d501ef64724faba5f41758083347db13","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-16-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975","date":"2017-09-19T22:00:34","name":"clustering implementation","version":1,"mbox":"http://patchwork.ozlabs.org/series/3975/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815882/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815882/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxcYM1kQlz9sMN\n\tfor ;\n\tWed, 20 Sep 2017 08:12:06 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 087D8CB2;\n\tTue, 19 Sep 2017 22:02:03 +0000 (UTC)","from smtp2.linuxfoundation.org (smtp2.linux-foundation.org\n\t[172.17.192.36])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 76D91A55\n\tfor ; Tue, 19 Sep 2017 22:01:58 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby smtp2.linuxfoundation.org (Postfix) with ESMTPS id B43351DD11\n\tfor ; Tue, 19 Sep 2017 22:01:57 +0000 (UTC)","from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 72B9117209B;\n\tWed, 20 Sep 2017 00:01:55 +0200 (CEST)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:00:48 -0700","Message-Id":"<20170919220125.32535-16-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170919220125.32535-1-blp@ovn.org>","References":"<20170919220125.32535-1-blp@ovn.org>","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW\n\tautolearn=ham version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp2.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH RFC 15/52] ovsdb-error: New function\n\tovsdb_error_to_json_free().","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"This simplifies little bits of code here and there.\n\nSigned-off-by: Ben Pfaff \n---\n lib/ovsdb-error.c | 8 ++++++++\n lib/ovsdb-error.h | 1 +\n ovsdb/execution.c | 4 +---\n ovsdb/jsonrpc-server.c | 24 ++++++------------------\n 4 files changed, 16 insertions(+), 21 deletions(-)","diff":"diff --git a/lib/ovsdb-error.c b/lib/ovsdb-error.c\nindex 82dc10966e99..dd08de687251 100644\n--- a/lib/ovsdb-error.c\n+++ b/lib/ovsdb-error.c\n@@ -221,6 +221,14 @@ ovsdb_error_to_json(const struct ovsdb_error *error)\n return json;\n }\n \n+struct json *\n+ovsdb_error_to_json_free(struct ovsdb_error *error)\n+{\n+ struct json *json = ovsdb_error_to_json(error);\n+ ovsdb_error_destroy(error);\n+ return json;\n+}\n+\n char *\n ovsdb_error_to_string(const struct ovsdb_error *error)\n {\ndiff --git a/lib/ovsdb-error.h b/lib/ovsdb-error.h\nindex ff9b889a8687..77a60e074f9c 100644\n--- a/lib/ovsdb-error.h\n+++ b/lib/ovsdb-error.h\n@@ -66,6 +66,7 @@ struct ovsdb_error *ovsdb_error_clone(const struct ovsdb_error *)\n char *ovsdb_error_to_string(const struct ovsdb_error *);\n char *ovsdb_error_to_string_free(struct ovsdb_error *);\n struct json *ovsdb_error_to_json(const struct ovsdb_error *);\n+struct json *ovsdb_error_to_json_free(struct ovsdb_error *);\n \n const char *ovsdb_error_get_tag(const struct ovsdb_error *);\n \ndiff --git a/ovsdb/execution.c b/ovsdb/execution.c\nindex 1ebe7a772e47..c6feafd7d552 100644\n--- a/ovsdb/execution.c\n+++ b/ovsdb/execution.c\n@@ -120,9 +120,7 @@ ovsdb_execute(struct ovsdb *db, const struct ovsdb_session *session,\n \"as first parameter\");\n }\n \n- results = ovsdb_error_to_json(error);\n- ovsdb_error_destroy(error);\n- return results;\n+ return ovsdb_error_to_json_free(error);\n }\n \n x.db = db;\ndiff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c\nindex 27cbd8449e3f..aec6603958d7 100644\n--- a/ovsdb/jsonrpc-server.c\n+++ b/ovsdb/jsonrpc-server.c\n@@ -730,8 +730,8 @@ ovsdb_jsonrpc_lookup_db(const struct ovsdb_jsonrpc_session *s,\n return db;\n \n error:\n- *replyp = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);\n- ovsdb_error_destroy(error);\n+ *replyp = jsonrpc_create_error(ovsdb_error_to_json_free(error),\n+ request->id);\n return NULL;\n }\n \n@@ -781,7 +781,6 @@ ovsdb_jsonrpc_session_lock(struct ovsdb_jsonrpc_session *s,\n enum ovsdb_lock_mode mode)\n {\n struct ovsdb_lock_waiter *waiter;\n- struct jsonrpc_msg *reply;\n struct ovsdb_error *error;\n struct ovsdb_session *victim;\n const char *lock_name;\n@@ -820,9 +819,7 @@ ovsdb_jsonrpc_session_lock(struct ovsdb_jsonrpc_session *s,\n return jsonrpc_create_reply(result, request->id);\n \n error:\n- reply = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);\n- ovsdb_error_destroy(error);\n- return reply;\n+ return jsonrpc_create_error(ovsdb_error_to_json_free(error), request->id);\n }\n \n static void\n@@ -857,7 +854,6 @@ ovsdb_jsonrpc_session_unlock(struct ovsdb_jsonrpc_session *s,\n struct jsonrpc_msg *request)\n {\n struct ovsdb_lock_waiter *waiter;\n- struct jsonrpc_msg *reply;\n struct ovsdb_error *error;\n const char *lock_name;\n \n@@ -884,9 +880,7 @@ ovsdb_jsonrpc_session_unlock(struct ovsdb_jsonrpc_session *s,\n return jsonrpc_create_reply(json_object_create(), request->id);\n \n error:\n- reply = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);\n- ovsdb_error_destroy(error);\n- return reply;\n+ return jsonrpc_create_error(ovsdb_error_to_json_free(error), request->id);\n }\n \n static struct jsonrpc_msg *\n@@ -1361,9 +1355,7 @@ error:\n ovsdb_jsonrpc_monitor_destroy(m);\n }\n \n- json = ovsdb_error_to_json(error);\n- ovsdb_error_destroy(error);\n- return jsonrpc_create_error(json, request_id);\n+ return jsonrpc_create_error(ovsdb_error_to_json_free(error), request_id);\n }\n \n static struct ovsdb_error *\n@@ -1406,7 +1398,6 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,\n struct ovsdb_jsonrpc_monitor *m;\n struct json *monitor_cond_change_reqs;\n struct shash_node *node;\n- struct json *json;\n \n if (json_array(params)->n != 3) {\n error = ovsdb_syntax_error(params, NULL, \"invalid parameters\");\n@@ -1490,10 +1481,7 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,\n return jsonrpc_create_reply(json_object_create(), request_id);\n \n error:\n-\n- json = ovsdb_error_to_json(error);\n- ovsdb_error_destroy(error);\n- return jsonrpc_create_error(json, request_id);\n+ return jsonrpc_create_error(ovsdb_error_to_json_free(error), request_id);\n }\n \n static struct jsonrpc_msg *\n","prefixes":["ovs-dev","RFC","15/52"]}