1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From 53ec87b8c5224b1069bef50d09403c53fb48640f Mon Sep 17 00:00:00 2001
From: sailorvii <chenw66@chinaunicom.cn>
Date: Tue, 21 Feb 2023 06:50:21 +0000
Subject: [PATCH 18/53] Refine typo of word "container".
---
src/daemon/executor/container_cb/execution_create.c | 2 +-
src/daemon/modules/api/container_api.h | 2 +-
src/daemon/modules/container/container_unix.c | 2 +-
src/daemon/modules/service/service_network.c | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/daemon/executor/container_cb/execution_create.c b/src/daemon/executor/container_cb/execution_create.c
index 4abc89c7..e8f74f1b 100644
--- a/src/daemon/executor/container_cb/execution_create.c
+++ b/src/daemon/executor/container_cb/execution_create.c
@@ -1481,7 +1481,7 @@ int container_create_cb(const container_create_request *request, container_creat
goto umount_channel;
}
- if (container_v2_spec_merge_contaner_spec(v2_spec) != 0) {
+ if (container_v2_spec_merge_container_spec(v2_spec) != 0) {
ERROR("Failed to merge container settings");
cc = ISULAD_ERR_EXEC;
goto umount_channel;
diff --git a/src/daemon/modules/api/container_api.h b/src/daemon/modules/api/container_api.h
index 270d6da6..1511db78 100644
--- a/src/daemon/modules/api/container_api.h
+++ b/src/daemon/modules/api/container_api.h
@@ -175,7 +175,7 @@ void container_unlock(container_t *cont);
char *container_get_env_nolock(const container_t *cont, const char *key);
-int container_v2_spec_merge_contaner_spec(container_config_v2_common_config *v2_spec);
+int container_v2_spec_merge_container_spec(container_config_v2_common_config *v2_spec);
char *container_get_command(const container_t *cont);
diff --git a/src/daemon/modules/container/container_unix.c b/src/daemon/modules/container/container_unix.c
index adc11be7..1a252b92 100644
--- a/src/daemon/modules/container/container_unix.c
+++ b/src/daemon/modules/container/container_unix.c
@@ -470,7 +470,7 @@ out:
}
/* container merge basic v2 spec info */
-int container_v2_spec_merge_contaner_spec(container_config_v2_common_config *v2_spec)
+int container_v2_spec_merge_container_spec(container_config_v2_common_config *v2_spec)
{
int ret = 0;
int i = 0;
diff --git a/src/daemon/modules/service/service_network.c b/src/daemon/modules/service/service_network.c
index 2e7fa28c..2d5f2f6e 100644
--- a/src/daemon/modules/service/service_network.c
+++ b/src/daemon/modules/service/service_network.c
@@ -569,7 +569,7 @@ err_out:
return NULL;
}
-static container_network_settings *dup_contaner_network_settings(const container_network_settings *settings)
+static container_network_settings *dup_container_network_settings(const container_network_settings *settings)
{
char *jstr = NULL;
container_network_settings *res = NULL;
@@ -1278,7 +1278,7 @@ static int update_container_network_settings(container_t *cont, const cni_anno_p
bool to_disk = false;
container_network_settings *backup = NULL;
- backup = dup_contaner_network_settings(cont->network_settings);
+ backup = dup_container_network_settings(cont->network_settings);
if (backup == NULL) {
ERROR("Failed to dup container network settings");
return -1;
@@ -1509,7 +1509,7 @@ static int drop_container_network_settings(container_t *cont)
return -1;
}
- backup = dup_contaner_network_settings(cont->network_settings);
+ backup = dup_container_network_settings(cont->network_settings);
if (backup == NULL) {
ERROR("Failed to dup container network settings");
return -1;
--
2.25.1
|
