p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!314 chore: update typo in rb tree comments 

Merge pull request !314 from kenneth/BR_Tree
This commit is contained in:
openharmony_ci 2021-06-22 06:34:30 +00:00 committed by Gitee
parent b7f2df0350 6e95771303
commit 1fa6ba3389
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libscrew/src/los_rbtree.c
View File

@ -132,7 +132,7 @@ STATIC VOID OsRbInsertNodeFixup(LosRbTree *pstTree, VOID *pstData)
LosRbNode *pstY = NULL; LosRbNode *pstY = NULL;
LosRbNode *pstX = NULL; LosRbNode *pstX = NULL;
/* begin: for earse pc-lint warning */ /* begin: for erase pc-lint warning */
if ((NULL == pstTree) || (NULL == pstData)) { if ((NULL == pstTree) || (NULL == pstData)) {
return; return;
} }
@ -271,7 +271,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
LosRbNode *pstZ = NULL; LosRbNode *pstZ = NULL;
LOS_DL_LIST *pstNode = NULL; LOS_DL_LIST *pstNode = NULL;
/* begin: for earse pc-lint warning */ /* begin: for erase pc-lint warning */
if ((NULL == pstTree) || (NULL == pstData)) { if ((NULL == pstTree) || (NULL == pstData)) {
return; return;
} }
@ -305,14 +305,14 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
if ((pstNilT == pstZ->pstLeft) || (pstNilT == pstZ->pstRight)) { if ((pstNilT == pstZ->pstLeft) || (pstNilT == pstZ->pstRight)) {
pstChild = ((pstNilT != pstZ->pstLeft) ? pstZ->pstLeft : pstZ->pstRight); pstChild = ((pstNilT != pstZ->pstLeft) ? pstZ->pstLeft : pstZ->pstRight);
if (NULL == pstChild) { /* Edit by r60958 for coverrity */ if (NULL == pstChild) { /* Edit by r60958 for Coverity */
return; return;
} }
pstChild->pstParent = pstZ->pstParent; pstChild->pstParent = pstZ->pstParent;
if (pstNilT == pstZ->pstParent) { if (pstNilT == pstZ->pstParent) {
/* if we arrive here, pastTree is no NULL, so we can close pclint warning */ /* if we arrive here, pstTree is no NULL, so we can close pclint warning */
/*lint -e613 */ /*lint -e613 */
/*lint -e831 */ /*lint -e831 */
pstTree->pstRoot = pstChild; pstTree->pstRoot = pstChild;
@ -330,7 +330,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
OsRbDeleteNodeFixup(pstTree, pstChild); OsRbDeleteNodeFixup(pstTree, pstChild);
} }
/* re-initalize the pstZ */ /* re-initialize the pstZ */
pstZ->lColor = LOS_RB_RED; pstZ->lColor = LOS_RB_RED;
pstZ->pstLeft = pstZ->pstRight = pstZ->pstParent = pstNilT; pstZ->pstLeft = pstZ->pstRight = pstZ->pstParent = pstNilT;
@ -352,7 +352,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
/* Because left is nilT, so child must be right. */ /* Because left is nilT, so child must be right. */
pstChild = pstZ->pstRight; pstChild = pstZ->pstRight;
if (NULL == pstChild) { /* Edit by r60958 for coverrity */ if (NULL == pstChild) { /* Edit by r60958 for Coverity */
return; return;
} }
@ -363,7 +363,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
if (pstNilT == pstZ->pstParent) { if (pstNilT == pstZ->pstParent) {
/* In fact, we never go here. */ /* In fact, we never go here. */
/* if we arrive here, pastTree is no NULL, so we can close pclint warning */ /* if we arrive here, pstTree is no NULL, so we can close pclint warning */
/*lint -e613 */ /*lint -e613 */
/*lint -e831 */ /*lint -e831 */
pstTree->pstRoot = pstChild; pstTree->pstRoot = pstChild;
@ -384,7 +384,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
pstZ->pstLeft = pstDel->pstLeft; pstZ->pstLeft = pstDel->pstLeft;
if (pstNilT == pstDel->pstParent) { if (pstNilT == pstDel->pstParent) {
/* if we arrive here, pastTree is no NULL, so we can close pclint warning */ /* if we arrive here, pstTree is no NULL, so we can close pclint warning */
/*lint -e613 */ /*lint -e613 */
/*lint -e831 */ /*lint -e831 */
pstTree->pstRoot = pstZ; pstTree->pstRoot = pstZ;
@ -405,7 +405,7 @@ STATIC VOID OsRbDeleteNode(LosRbTree *pstTree, VOID *pstData)
OsRbDeleteNodeFixup(pstTree, pstChild); OsRbDeleteNodeFixup(pstTree, pstChild);
} }
/* re-initalize the pstDel */ /* re-initialize the pstDel */
pstDel->lColor = LOS_RB_RED; pstDel->lColor = LOS_RB_RED;
pstDel->pstLeft = pstDel->pstRight = pstDel->pstParent = pstNilT; pstDel->pstLeft = pstDel->pstRight = pstDel->pstParent = pstNilT;
return; return;
@ -614,7 +614,7 @@ VOID *LOS_RbSuccessorNode(LosRbTree *pstTree, VOID *pstData)
LosRbNode *pstNilT = NULL; LosRbNode *pstNilT = NULL;
LosRbNode *pstNode = NULL; LosRbNode *pstNode = NULL;
/* begin: for earse pc_lint warning */ /* begin: for erase pc_lint warning */
if (NULL == pstTree) { if (NULL == pstTree) {
return NULL; return NULL;
} }
@ -631,7 +631,7 @@ VOID *LOS_RbSuccessorNode(LosRbTree *pstTree, VOID *pstData)
return NULL; return NULL;
} }
/* if we arrive here, pastTree is no NULL, so we can close pclint warning */ /* if we arrive here, pstTree is no NULL, so we can close pclint warning */
/*lint -e613 */ /*lint -e613 */
/*lint -e831 */ /*lint -e831 */
pstNilT = &(pstTree->stNilT); pstNilT = &(pstTree->stNilT);