diff --git a/services/init/standard/switch_root.c b/services/init/standard/switch_root.c index 33a2a9eeb9e86425a2bf74ed7acda982ac29afc5..6cc3df2e0cbca603d9db22feadd9efe99122f602 100755 --- a/services/init/standard/switch_root.c +++ b/services/init/standard/switch_root.c @@ -140,7 +140,6 @@ static void FreeRootDir(DIR *oldRoot, dev_t dev) if (oldRoot != NULL) { FreeOldRoot(oldRoot, dev); closedir(oldRoot); - oldRoot = NULL; } } diff --git a/services/param/manager/param_manager.c b/services/param/manager/param_manager.c index 6196f4badacd7761f3e47d6841021b52c848de27..1cc40a4dd88342e3585d74d459609b99c7dcd870 100755 --- a/services/param/manager/param_manager.c +++ b/services/param/manager/param_manager.c @@ -76,7 +76,7 @@ int InitParamWorkSpace(ParamWorkSpace *workSpace, int onlyRead) void CloseParamWorkSpace(ParamWorkSpace *workSpace) { - PARAM_CHECK(workSpace != NULL, return, "Invalid workSpace"); + PARAM_CHECK(workSpace != NULL, return, "Invalid workSpace"); CloseWorkSpace(&workSpace->paramSpace); if (workSpace->paramSecurityOps.securityFreeLabel != NULL) { workSpace->paramSecurityOps.securityFreeLabel(workSpace->securityLabel); diff --git a/test/unittest/init/cmds_unittest.cpp b/test/unittest/init/cmds_unittest.cpp index 2669ca5a7ed38de860de0bac8af4a09fdc14c4a3..8cd9174bc1d43058633e8fa8d3573f46c1e391a2 100755 --- a/test/unittest/init/cmds_unittest.cpp +++ b/test/unittest/init/cmds_unittest.cpp @@ -178,7 +178,7 @@ HWTEST_F(CmdsUnitTest, TestCommonWrite, TestSize.Level1) const int bufLen = 50; char buffer[bufLen]; int length = read(fd, buffer, bufLen - 1); - EXPECT_EQ(length, strlen("aaa")); + EXPECT_EQ(length, strlen("aaa")); close(fd); fd = -1; // abnormal