iSulad/0011-remove-redundant-code.patch

From 3e2793ee0124dff55464ad78d34ab2288ab7c382 Mon Sep 17 00:00:00 2001
From: wujing <wujing50@huawei.com>
Date: Mon, 28 Feb 2022 19:40:45 +0800
Subject: [PATCH 11/16] remove redundant code

Signed-off-by: wujing <wujing50@huawei.com>
---
 .../connect/grpc/grpc_volumes_client.cc       | 16 +++++++-------
 src/client/connect/protocol_type.c            | 22 +------------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/client/connect/grpc/grpc_volumes_client.cc b/src/client/connect/grpc/grpc_volumes_client.cc
index 5d55b8c8..902e8a13 100644
--- a/src/client/connect/grpc/grpc_volumes_client.cc
+++ b/src/client/connect/grpc/grpc_volumes_client.cc
@@ -27,10 +27,10 @@ using grpc::ClientContext;
 using grpc::Status;
 
 class VolumeList : public ClientBase<VolumeService, VolumeService::Stub, isula_list_volume_request, ListVolumeRequest,
-                                     isula_list_volume_response, ListVolumeResponse> {
+    isula_list_volume_response, ListVolumeResponse> {
 public:
     explicit VolumeList(void *args)
-            : ClientBase(args)
+        : ClientBase(args)
     {
     }
     ~VolumeList() = default;
@@ -58,7 +58,7 @@ public:
             return -1;
         }
         auto *volumes = static_cast<struct isula_volume_info *>(
-                util_smart_calloc_s(sizeof(struct isula_volume_info), static_cast<size_t>(num)));
+                            util_smart_calloc_s(sizeof(struct isula_volume_info), static_cast<size_t>(num)));
         if (volumes == nullptr) {
             ERROR("out of memory");
             response->cc = ISULAD_ERR_MEMOUT;
@@ -90,10 +90,10 @@ public:
 };
 
 class VolumeRemove : public ClientBase<VolumeService, VolumeService::Stub, isula_remove_volume_request,
-                                       RemoveVolumeRequest, isula_remove_volume_response, RemoveVolumeResponse> {
+    RemoveVolumeRequest, isula_remove_volume_response, RemoveVolumeResponse> {
 public:
     explicit VolumeRemove(void *args)
-            : ClientBase(args)
+        : ClientBase(args)
     {
     }
     ~VolumeRemove() = default;
@@ -135,17 +135,17 @@ public:
     }
 
     auto grpc_call(ClientContext *context, const RemoveVolumeRequest &req, RemoveVolumeResponse *reply)
-            -> Status override
+    -> Status override
     {
         return stub_->Remove(context, req, reply);
     }
 };
 
 class VolumePrune : public ClientBase<VolumeService, VolumeService::Stub, isula_prune_volume_request,
-                                      PruneVolumeRequest, isula_prune_volume_response, PruneVolumeResponse> {
+    PruneVolumeRequest, isula_prune_volume_response, PruneVolumeResponse> {
 public:
     explicit VolumePrune(void *args)
-            : ClientBase(args)
+        : ClientBase(args)
     {
     }
     ~VolumePrune() = default;
diff --git a/src/client/connect/protocol_type.c b/src/client/connect/protocol_type.c
index 3e5dafb1..af582abf 100644
--- a/src/client/connect/protocol_type.c
+++ b/src/client/connect/protocol_type.c
@@ -916,7 +916,6 @@ void isula_create_image_request_free(struct isula_create_image_request *request)
     request->image_info.digest = NULL;
 
     free(request);
-    return;
 }
 
 /* isula create image response free */
@@ -939,7 +938,6 @@ void isula_create_image_response_free(struct isula_create_image_response *respon
     response->image_info.digest = NULL;
 
     free(response);
-    return;
 }
 
 /* isula images list free */
@@ -959,7 +957,6 @@ void isula_images_list_free(size_t images_num, struct isula_image_info *images_l
     }
 
     free(images_list);
-    return;
 }
 
 /* isula list images request free */
@@ -970,7 +967,6 @@ void isula_list_images_request_free(struct isula_list_images_request *request)
     }
 
     free(request);
-    return;
 }
 
 /* isula list images response free */
@@ -1000,7 +996,6 @@ void isula_rmi_request_free(struct isula_rmi_request *request)
     request->image_name = NULL;
 
     free(request);
-    return;
 }
 
 /* isula rmi response free */
@@ -1014,7 +1009,6 @@ void isula_rmi_response_free(struct isula_rmi_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula tag request free */
@@ -1030,7 +1024,6 @@ void isula_tag_request_free(struct isula_tag_request *request)
     request->dest_name = NULL;
 
     free(request);
-    return;
 }
 
 /* isula tag response free */
@@ -1044,7 +1037,6 @@ void isula_tag_response_free(struct isula_tag_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula pull response free */
@@ -1058,7 +1050,6 @@ void isula_pull_request_free(struct isula_pull_request *request)
     request->image_name = NULL;
 
     free(request);
-    return;
 }
 
 /* isula pull response free */
@@ -1074,7 +1065,6 @@ void isula_pull_response_free(struct isula_pull_response *response)
     free(response->errmsg);
     response->errmsg = NULL;
     free(response);
-    return;
 }
 
 /* isula import request free */
@@ -1091,7 +1081,6 @@ void isula_import_request_free(struct isula_import_request *request)
     request->tag = NULL;
 
     free(request);
-    return;
 }
 
 /* isula import response free */
@@ -1108,7 +1097,6 @@ void isula_import_response_free(struct isula_import_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula load request free */
@@ -1128,7 +1116,6 @@ void isula_load_request_free(struct isula_load_request *request)
     request->tag = NULL;
 
     free(request);
-    return;
 }
 
 /* isula load response free */
@@ -1142,7 +1129,6 @@ void isula_load_response_free(struct isula_load_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula login response free */
@@ -1156,7 +1142,6 @@ void isula_login_response_free(struct isula_login_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula logout response free */
@@ -1170,7 +1155,6 @@ void isula_logout_response_free(struct isula_logout_response *response)
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 /* isula export request free */
@@ -1331,8 +1315,6 @@ void isula_volume_list_free(size_t volumes_len, struct isula_volume_info *volume
         free(volume->name);
     }
     free(volumes);
-
-    return;
 }
 
 void isula_list_volume_response_free(struct isula_list_volume_response *response)
@@ -1349,7 +1331,6 @@ void isula_list_volume_response_free(struct isula_list_volume_response *response
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 void isula_remove_volume_response_free(struct isula_remove_volume_response *response)
@@ -1362,7 +1343,6 @@ void isula_remove_volume_response_free(struct isula_remove_volume_response *resp
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
 
 void isula_prune_volume_response_free(struct isula_prune_volume_response *response)
@@ -1386,5 +1366,5 @@ void isula_prune_volume_response_free(struct isula_prune_volume_response *respon
     response->errmsg = NULL;
 
     free(response);
-    return;
 }
+
-- 
2.20.1