Skip to content

Commit 7c7da4c

Browse files
committed
Cleans up mergeforward implementation
Uses consistent naming (_np) for native pointer equivalents of Lisp addresses
1 parent f375519 commit 7c7da4c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/gcfinal.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,17 +460,17 @@ LispPTR mergebackward(LispPTR base) {
460460

461461
LispPTR mergeforward(LispPTR base) {
462462
LispPTR nbase, nbinuse;
463-
struct arrayblock *bbase, *bnbase;
463+
struct arrayblock *base_np, *nbase_np;
464464
if (*ArrayMerging_word == NIL) return NIL;
465465
if (base == NIL) return NIL;
466466
if (checkarrayblock(base, T, T)) return NIL;
467467

468-
bbase = (struct arrayblock *)NativeAligned4FromLAddr(base);
469-
nbase = base + DLWORDSPER_CELL * (bbase->arlen);
468+
base_np = (struct arrayblock *)NativeAligned4FromLAddr(base);
469+
nbase = base + DLWORDSPER_CELL * (base_np->arlen);
470470
if (nbase == *ArrayFrLst_word || nbase == *ArrayFrLst2_word) return NIL;
471471

472-
bnbase = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
473-
nbinuse = bnbase->inuse;
472+
nbase_np = (struct arrayblock *)NativeAligned4FromLAddr(nbase);
473+
nbinuse = nbase_np->inuse;
474474
if (checkarrayblock(nbase, !nbinuse, NIL)) return NIL;
475475
if (nbinuse) return (NIL);
476476
deleteblock(nbase);

0 commit comments

Comments
 (0)