ovsdb-error: New function ovsdb_error_to_json_free().

This simplifies little bits of code here and there.

Signed-off-by: Ben Pfaff <blp@ovn.org>
Tested-by: Yifeng Sun <pkusunyifeng@gmail.com>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>

1 files changed, 6 insertions, 18 deletions

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index b94681daf..f4a14d4fb 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -730,8 +730,8 @@ ovsdb_jsonrpc_lookup_db(const struct ovsdb_jsonrpc_session *s,
     return db;
 
 error:
-    *replyp = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);
-    ovsdb_error_destroy(error);
+    *replyp = jsonrpc_create_error(ovsdb_error_to_json_free(error),
+                                   request->id);
     return NULL;
 }
 
@@ -781,7 +781,6 @@ ovsdb_jsonrpc_session_lock(struct ovsdb_jsonrpc_session *s,
                            enum ovsdb_lock_mode mode)
 {
     struct ovsdb_lock_waiter *waiter;
-    struct jsonrpc_msg *reply;
     struct ovsdb_error *error;
     struct ovsdb_session *victim;
     const char *lock_name;
@@ -820,9 +819,7 @@ ovsdb_jsonrpc_session_lock(struct ovsdb_jsonrpc_session *s,
     return jsonrpc_create_reply(result, request->id);
 
 error:
-    reply = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);
-    ovsdb_error_destroy(error);
-    return reply;
+    return jsonrpc_create_error(ovsdb_error_to_json_free(error), request->id);
 }
 
 static void
@@ -857,7 +854,6 @@ ovsdb_jsonrpc_session_unlock(struct ovsdb_jsonrpc_session *s,
                              struct jsonrpc_msg *request)
 {
     struct ovsdb_lock_waiter *waiter;
-    struct jsonrpc_msg *reply;
     struct ovsdb_error *error;
     const char *lock_name;
 
@@ -884,9 +880,7 @@ ovsdb_jsonrpc_session_unlock(struct ovsdb_jsonrpc_session *s,
     return jsonrpc_create_reply(json_object_create(), request->id);
 
 error:
-    reply = jsonrpc_create_error(ovsdb_error_to_json(error), request->id);
-    ovsdb_error_destroy(error);
-    return reply;
+    return jsonrpc_create_error(ovsdb_error_to_json_free(error), request->id);
 }
 
 static struct jsonrpc_msg *
@@ -1361,9 +1355,7 @@ error:
         ovsdb_jsonrpc_monitor_destroy(m);
     }
 
-    json = ovsdb_error_to_json(error);
-    ovsdb_error_destroy(error);
-    return jsonrpc_create_error(json, request_id);
+    return jsonrpc_create_error(ovsdb_error_to_json_free(error), request_id);
 }
 
 static struct ovsdb_error *
@@ -1406,7 +1398,6 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,
     struct ovsdb_jsonrpc_monitor *m;
     struct json *monitor_cond_change_reqs;
     struct shash_node *node;
-    struct json *json;
 
     if (json_array(params)->n != 3) {
         error = ovsdb_syntax_error(params, NULL, "invalid parameters");
@@ -1490,10 +1481,7 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,
     return jsonrpc_create_reply(json_object_create(), request_id);
 
 error:
-
-    json = ovsdb_error_to_json(error);
-    ovsdb_error_destroy(error);
-    return jsonrpc_create_error(json, request_id);
+    return jsonrpc_create_error(ovsdb_error_to_json_free(error), request_id);
 }
 
 static struct jsonrpc_msg *