From 819179f275bf9c94c7366e59a0eedab9450ef9a4 Mon Sep 17 00:00:00 2001
From: Daniel Colascione <dancol@dancol.org>
Date: Sun, 4 Mar 2018 17:13:28 -0800
Subject: [PATCH] Rename marker_free_list to misc_free_list
* src/alloc.c: 'marker_free_list' -> 'misc_free_list' throughout
---
src/alloc.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/alloc.c b/src/alloc.c
index ea8fdeee483..f97b99c0f31 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3661,7 +3661,7 @@ struct marker_block
static struct marker_block *marker_block;
static int marker_block_index = MARKER_BLOCK_SIZE;
-static union Lisp_Misc *marker_free_list;
+static union Lisp_Misc *misc_free_list;
/* Return a newly allocated Lisp_Misc object of specified TYPE. */
@@ -3672,10 +3672,10 @@ allocate_misc (enum Lisp_Misc_Type type)
MALLOC_BLOCK_INPUT;
- if (marker_free_list)
+ if (misc_free_list)
{
- XSETMISC (val, marker_free_list);
- marker_free_list = marker_free_list->u_free.chain;
+ XSETMISC (val, misc_free_list);
+ misc_free_list = misc_free_list->u_free.chain;
}
else
{
@@ -3707,8 +3707,8 @@ void
free_misc (Lisp_Object misc)
{
XMISCANY (misc)->type = Lisp_Misc_Free;
- XMISC (misc)->u_free.chain = marker_free_list;
- marker_free_list = XMISC (misc);
+ XMISC (misc)->u_free.chain = misc_free_list;
+ misc_free_list = XMISC (misc);
consing_since_gc -= sizeof (union Lisp_Misc);
total_free_markers++;
}
@@ -7079,7 +7079,7 @@ sweep_misc (void)
/* Put all unmarked misc's on free list. For a marker, first
unchain it from the buffer it points into. */
- marker_free_list = 0;
+ misc_free_list = 0;
for (mblk = marker_block; mblk; mblk = *mprev)
{
@@ -7106,8 +7106,8 @@ sweep_misc (void)
We could leave the type alone, since nobody checks it,
but this might catch bugs faster. */
mblk->markers[i].m.u_marker.type = Lisp_Misc_Free;
- mblk->markers[i].m.u_free.chain = marker_free_list;
- marker_free_list = &mblk->markers[i].m;
+ mblk->markers[i].m.u_free.chain = misc_free_list;
+ misc_free_list = &mblk->markers[i].m;
this_free++;
}
else
@@ -7124,7 +7124,7 @@ sweep_misc (void)
{
*mprev = mblk->next;
/* Unhook from the free list. */
- marker_free_list = mblk->markers[0].m.u_free.chain;
+ misc_free_list = mblk->markers[0].m.u_free.chain;
lisp_free (mblk);
}
else
--
2.39.5