From 7c7da4cd0cdf6068806e7e8f55d506ab3b828773 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 19 Jul 2025 13:19:27 -0700 Subject: [PATCH] Cleans up mergeforward implementation Uses consistent naming (_np) for native pointer equivalents of Lisp addresses --- src/gcfinal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gcfinal.c b/src/gcfinal.c index 2f52fdd..c186507 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -460,17 +460,17 @@ LispPTR mergebackward(LispPTR base) { LispPTR mergeforward(LispPTR base) { LispPTR nbase, nbinuse; - struct arrayblock *bbase, *bnbase; + struct arrayblock *base_np, *nbase_np; if (*ArrayMerging_word == NIL) return NIL; if (base == NIL) return NIL; if (checkarrayblock(base, T, T)) return NIL; - bbase = (struct arrayblock *)NativeAligned4FromLAddr(base); - nbase = base + DLWORDSPER_CELL * (bbase->arlen); + base_np = (struct arrayblock *)NativeAligned4FromLAddr(base); + nbase = base + DLWORDSPER_CELL * (base_np->arlen); if (nbase == *ArrayFrLst_word || nbase == *ArrayFrLst2_word) return NIL; - bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase); - nbinuse = bnbase->inuse; + nbase_np = (struct arrayblock *)NativeAligned4FromLAddr(nbase); + nbinuse = nbase_np->inuse; if (checkarrayblock(nbase, !nbinuse, NIL)) return NIL; if (nbinuse) return (NIL); deleteblock(nbase);