Remove that Heap_1.c unnecessary judgment and code logic

huangly · huangly · commit 06743b414d88 · 2024-05-29T16:08:50.000+08:00
diff --git a/portable/MemMang/heap_1.c b/portable/MemMang/heap_1.c
@@ -78,15 +78,7 @@ void * pvPortMalloc( size_t xWantedSize )
     {
         if( xWantedSize & portBYTE_ALIGNMENT_MASK )
         {
-            /* Byte alignment required. Check for overflow. */
-            if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) ) > xWantedSize )
-            {
-                xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
-            }
-            else
-            {
-                xWantedSize = 0;
-            }
+            xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );
         }
     }
     #endif /* if ( portBYTE_ALIGNMENT != 1 ) */

Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,7 @@ void * pvPortMalloc( size_t xWantedSize )`
`78`	`78`	`{`
`79`	`79`	`if( xWantedSize & portBYTE_ALIGNMENT_MASK )`
`80`	`80`	`{`
`81`		`- /* Byte alignment required. Check for overflow. */`
`82`		`- if( ( xWantedSize + ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) ) ) > xWantedSize )`
`83`		`- {`
`84`		`- xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );`
`85`		`- }`
`86`		`- else`
`87`		`- {`
`88`		`- xWantedSize = 0;`
`89`		`- }`
	`81`	`+ xWantedSize += ( portBYTE_ALIGNMENT - ( xWantedSize & portBYTE_ALIGNMENT_MASK ) );`
`90`	`82`	`}`
`91`	`83`	`}`
`92`	`84`	`#endif /* if ( portBYTE_ALIGNMENT != 1 ) */`