未验证 提交 929add05 编写于 作者: O openharmony_ci 提交者: Gitee

!908 FIX: 修改L2 CJson为动态库

Merge pull request !908 from Mupceet/0705
......@@ -183,7 +183,7 @@ if (defined(ohos_lite)) {
"//base/startup/init_lite/services/param/linux:param_client",
"//base/startup/init_lite/services/utils:libinit_utils",
"//third_party/bounds_checking_function:libsec_shared",
"//third_party/cJSON:cjson_static",
"//third_party/cJSON:cjson",
"//third_party/mbedtls:mbedtls_shared",
]
external_deps = [
......
......@@ -163,7 +163,7 @@ int SystemSetParameter(const char *name, const char *value)
}
fd = g_clientFd;
pthread_mutex_unlock(&g_clientMutex);
PARAM_CHECK(fd > 0, return -1, "Failed to connect server for set %s", name);
PARAM_CHECK(fd >= 0, return -1, "Failed to connect server for set %s", name);
ret = StartRequest(fd, request, DEFAULT_PARAM_SET_TIMEOUT);
free(request);
PARAM_LOGI("SystemSetParameter name %s %d", name, ret);
......@@ -212,7 +212,7 @@ int SystemWaitParameter(const char *name, const char *value, int32_t timeout)
timeout = 1;
#endif
int fd = GetClientSocket(timeout);
PARAM_CHECK(fd > 0, return -1, "Failed to connect server for wait %s", name);
PARAM_CHECK(fd >= 0, return -1, "Failed to connect server for wait %s", name);
ret = StartRequest(fd, request, timeout);
close(fd);
free(request);
......
......@@ -205,7 +205,7 @@ ohos_unittest("init_unittest") {
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/cJSON:cjson_static",
"//third_party/cJSON:cjson",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest",
"//third_party/mbedtls:mbedtls_shared",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册