提交 2d2979e9 编写于 作者: W wujing

Adapt to lower version of gcc

Signed-off-by: Nwujing <wujing50@huawei.com>
上级 6e36a703
......@@ -632,9 +632,10 @@ out:
static bool valid_options(const char *opt)
{
size_t i;
const char *opts[] = { "disable", "type", "user", "role", "level" };
for (size_t i = 0; i < sizeof(opts) / sizeof(char *); i++) {
for (i = 0; i < sizeof(opts) / sizeof(char *); i++) {
if (strcmp(opt, opts[i]) == 0) {
return true;
}
......@@ -768,9 +769,10 @@ int init_label(const char **label_opts, size_t label_opts_len, char **dst_proces
}
if (process_label != NULL) {
size_t i;
pcon = context_new(process_label);
mcon = context_new(mount_label);
for (size_t i = 0; i < label_opts_len; i++) {
for (i = 0; i < label_opts_len; i++) {
if (strcmp(label_opts[i], "disable") == 0) {
goto out;
}
......
......@@ -11,6 +11,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_convert.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_verify.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/utils_regex.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cutils/util_atomic.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/sha256/sha256.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/path.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/cmd/commander.c
......
......@@ -11,6 +11,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils_string.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils_convert.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/utils_file.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cutils/util_atomic.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/log.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/sha256/sha256.c
${CMAKE_BINARY_DIR}/json/json_common.c
......
......@@ -10,6 +10,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_string.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_convert.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_file.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/util_atomic.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/log.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/sha256/sha256.c
${CMAKE_BINARY_DIR}/json/json_common.c
......
......@@ -10,6 +10,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_string.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_convert.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/utils_file.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cutils/util_atomic.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/log.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/sha256/sha256.c
${CMAKE_BINARY_DIR}/json/json_common.c
......@@ -37,6 +38,7 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/namespace_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/container_unix_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/engine_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/selinux_label_mock.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/isulad_config_mock.cc
${CMAKE_BINARY_DIR}/json/imagetool_image.c
${CMAKE_BINARY_DIR}/json/oci_image_spec.c
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册