Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
f0476684
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f0476684
编写于
6月 28, 2020
作者:
L
lifeng68
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean code: remove unused code
Signed-off-by:
N
lifeng68
<
lifeng68@huawei.com
>
上级
3174fdcb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
45 deletion
+22
-45
src/daemon/executor/container_cb/execution_stream.c
src/daemon/executor/container_cb/execution_stream.c
+22
-2
src/daemon/libisulad.c
src/daemon/libisulad.c
+0
-14
src/daemon/libisulad.h
src/daemon/libisulad.h
+0
-29
未找到文件。
src/daemon/executor/container_cb/execution_stream.c
浏览文件 @
f0476684
...
...
@@ -47,6 +47,13 @@
#include "container_operator.h"
#include "io_handler.h"
struct
container_log_config
{
char
*
driver
;
char
*
path
;
int
rotate
;
int64_t
size
;
};
static
int
do_append_process_exec_env
(
const
char
**
default_env
,
defs_process
*
spec
)
{
int
ret
=
0
;
...
...
@@ -295,8 +302,7 @@ err_out:
return
NULL
;
}
static
int
exec_container
(
container_t
*
cont
,
const
char
*
runtime
,
char
*
const
console_fifos
[],
defs_process_user
*
puser
,
static
int
exec_container
(
container_t
*
cont
,
const
char
*
runtime
,
char
*
const
console_fifos
[],
defs_process_user
*
puser
,
const
container_exec_request
*
request
,
int
*
exit_code
)
{
int
ret
=
0
;
...
...
@@ -2055,6 +2061,20 @@ static bool support_logs(struct container_log_config *log_config)
return
true
;
}
static
void
container_log_config_free
(
struct
container_log_config
*
conf
)
{
if
(
conf
==
NULL
)
{
return
;
}
free
(
conf
->
path
);
conf
->
path
=
NULL
;
free
(
conf
->
driver
);
conf
->
driver
=
NULL
;
conf
->
rotate
=
0
;
conf
->
size
=
0
;
free
(
conf
);
}
static
int
container_logs_cb
(
const
struct
isulad_logs_request
*
request
,
stream_func_wrapper
*
stream
,
struct
isulad_logs_response
**
response
)
{
...
...
src/daemon/libisulad.c
浏览文件 @
f0476684
...
...
@@ -233,20 +233,6 @@ void isulad_logs_response_free(struct isulad_logs_response *response)
free
(
response
);
}
void
container_log_config_free
(
struct
container_log_config
*
conf
)
{
if
(
conf
==
NULL
)
{
return
;
}
free
(
conf
->
path
);
conf
->
path
=
NULL
;
free
(
conf
->
driver
);
conf
->
driver
=
NULL
;
conf
->
rotate
=
0
;
conf
->
size
=
0
;
free
(
conf
);
}
/* events copy */
int
event_copy
(
const
struct
isulad_events_format
*
src
,
struct
isulad_events_format
*
dest
)
{
...
...
src/daemon/libisulad.h
浏览文件 @
f0476684
...
...
@@ -199,35 +199,6 @@ struct isulad_container_resize_response {
char
*
errmsg
;
};
struct
isulad_image_info
{
char
*
imageref
;
char
*
type
;
char
*
digest
;
int64_t
created
;
/* seconds */
int32_t
created_nanos
;
int64_t
size
;
/* Bytes */
};
struct
isulad_create_image_request
{
struct
isulad_image_info
image_info
;
};
struct
isulad_create_image_response
{
uint32_t
cc
;
uint32_t
server_errono
;
struct
isulad_image_info
image_info
;
char
*
errmsg
;
};
struct
container_log_config
{
char
*
driver
;
char
*
path
;
int
rotate
;
int64_t
size
;
};
void
container_log_config_free
(
struct
container_log_config
*
conf
);
void
isulad_events_request_free
(
struct
isulad_events_request
*
request
);
void
isulad_copy_from_container_request_free
(
struct
isulad_copy_from_container_request
*
request
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录