5ec852595b
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com> (cherry picked from commit 9c3acba9915c23718ae8a806daa49022a73756eb)
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 2b3a35ec1e0e3afd090618f2120fd8e756c4c0c6 Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Wed, 19 Apr 2023 07:22:42 +0800
|
|
Subject: [PATCH 44/46] remove unused func
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
.../modules/runtime/isula/isula_rt_ops.c | 31 ++-----------------
|
|
1 file changed, 2 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
index 5a01b8c6..3a6269a1 100644
|
|
--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
+++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
|
|
@@ -1078,28 +1078,6 @@ int rt_isula_rm(const char *id, const char *runtime, const rt_rm_params_t *param
|
|
return 0;
|
|
}
|
|
|
|
-static char *try_generate_exec_id()
|
|
-{
|
|
- char *id = NULL;
|
|
-
|
|
- id = util_common_calloc_s(sizeof(char) * (CONTAINER_EXEC_ID_MAX_LEN + 1));
|
|
- if (id == NULL) {
|
|
- ERROR("Out of memory");
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- if (util_generate_random_str(id, (size_t)CONTAINER_EXEC_ID_MAX_LEN) != 0) {
|
|
- ERROR("Generate id failed");
|
|
- goto err_out;
|
|
- }
|
|
-
|
|
- return id;
|
|
-
|
|
-err_out:
|
|
- free(id);
|
|
- return NULL;
|
|
-}
|
|
-
|
|
static bool fg_exec(const rt_exec_params_t *params)
|
|
{
|
|
if (params->console_fifos[0] != NULL || params->console_fifos[1] != NULL || params->console_fifos[2] != NULL) {
|
|
@@ -1122,7 +1100,7 @@ int rt_isula_exec(const char *id, const char *runtime, const rt_exec_params_t *p
|
|
int pid = 0;
|
|
shim_client_process_state p = { 0 };
|
|
|
|
- if (id == NULL || runtime == NULL || params == NULL || exit_code == NULL) {
|
|
+ if (id == NULL || runtime == NULL || params == NULL || exit_code == NULL || params->suffix == NULL) {
|
|
ERROR("nullptr arguments not allowed");
|
|
return -1;
|
|
}
|
|
@@ -1135,12 +1113,7 @@ int rt_isula_exec(const char *id, const char *runtime, const rt_exec_params_t *p
|
|
return -1;
|
|
}
|
|
|
|
- if (params->suffix != NULL) {
|
|
- exec_id = util_strdup_s(params->suffix);
|
|
- } else {
|
|
- exec_id = try_generate_exec_id();
|
|
- }
|
|
-
|
|
+ exec_id = util_strdup_s(params->suffix);
|
|
if (exec_id == NULL) {
|
|
ERROR("Out of memory or generate exec id failed");
|
|
return -1;
|
|
--
|
|
2.25.1
|
|
|