This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ed1c07ff1e758f9bab3e14679e130537c0dc6f03 Author: huojianchao <[email protected]> AuthorDate: Tue Nov 10 12:15:18 2026 +0800 mm/kasan,sim: fix pre-existing nxstyle errors Fix missing blank lines after declarations and while-loop on same line reported by tools/nxstyle in the following files: - arch/sim/src/sim/sim_fork.c - mm/kasan/generic.c - mm/kasan/sw_tags.c - mm/mm_heap/mm_initialize.c - mm/mm_heap/mm_mallinfo.c No functional change. Signed-off-by: huojianchao <[email protected]> --- arch/sim/src/sim/sim_fork.c | 6 +++++- mm/kasan/generic.c | 1 + mm/kasan/sw_tags.c | 1 + mm/mm_heap/mm_initialize.c | 1 + mm/mm_heap/mm_mallinfo.c | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/sim/src/sim/sim_fork.c b/arch/sim/src/sim/sim_fork.c index 72ff6c98a7e..74197b8aec7 100644 --- a/arch/sim/src/sim/sim_fork.c +++ b/arch/sim/src/sim/sim_fork.c @@ -142,13 +142,17 @@ pid_t sim_fork(bool vfork, const xcpt_reg_t *context) newsp = newtop - stackutil; pout = (unsigned char *)newsp; pin = (unsigned char *)context[JB_SP]; - while (stackutil-- > 0) *pout++ = *pin++; + while (stackutil-- > 0) + { + *pout++ = *pin++; + } /* Was there a frame pointer in place before? */ if (context[JB_FP] >= context[JB_SP] && context[JB_FP] < stacktop) { xcpt_reg_t frameutil = stacktop - context[JB_FP]; + newfp = newtop - frameutil; } else diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index 6f4732c0f7e..bde55ac5d6c 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -269,6 +269,7 @@ void kasan_unregister(FAR void *addr) if (g_region[i]->begin == (uintptr_t)addr) { size_t size = g_region[i]->end - g_region[i]->begin; + g_region_count--; memmove(&g_region[i], &g_region[i + 1], (g_region_count - i) * sizeof(g_region[0])); diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 111b8678876..c5640412f8f 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -218,6 +218,7 @@ void kasan_unregister(FAR void *addr) if (g_region[i]->begin == (uintptr_t)addr) { size_t size = g_region[i]->end - g_region[i]->begin; + g_region_count--; memmove(&g_region[i], &g_region[i + 1], (g_region_count - i) * sizeof(g_region[0])); diff --git a/mm/mm_heap/mm_initialize.c b/mm/mm_heap/mm_initialize.c index 280c9ba39f6..bf25814beaa 100644 --- a/mm/mm_heap/mm_initialize.c +++ b/mm/mm_heap/mm_initialize.c @@ -246,6 +246,7 @@ mm_initialize_heap(FAR const struct mm_heap_config_s *config) /* First ensure the memory to be used is aligned */ uintptr_t heap_adj = MM_ALIGN_UP((uintptr_t)heapstart); + heapsize -= heap_adj - (uintptr_t)heapstart; /* Reserve a block space for mm_heap_s context */ diff --git a/mm/mm_heap/mm_mallinfo.c b/mm/mm_heap/mm_mallinfo.c index f160132ab2a..a040c66b479 100644 --- a/mm/mm_heap/mm_mallinfo.c +++ b/mm/mm_heap/mm_mallinfo.c @@ -212,6 +212,7 @@ size_t mm_heapfree_largest(FAR struct mm_heap_s *heap) node = node->blink) { size_t nodesize = MM_SIZEOF_NODE(node); + if (nodesize != 0) { return nodesize;
