diff options
| author | Daniel Colascione | 2018-03-04 17:13:28 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2018-03-04 17:14:32 -0800 |
| commit | 819179f275bf9c94c7366e59a0eedab9450ef9a4 (patch) | |
| tree | 90002ccd38e5493a195a90e54755142e8783e23a /src/alloc.c | |
| parent | 1bc998f98f937ee82e29d80e19fda7c32632501a (diff) | |
| download | emacs-819179f275bf9c94c7366e59a0eedab9450ef9a4.tar.gz emacs-819179f275bf9c94c7366e59a0eedab9450ef9a4.zip | |
Rename marker_free_list to misc_free_list
* src/alloc.c: 'marker_free_list' -> 'misc_free_list' throughout
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 20 |
1 files 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 | |||
| 3661 | static struct marker_block *marker_block; | 3661 | static struct marker_block *marker_block; |
| 3662 | static int marker_block_index = MARKER_BLOCK_SIZE; | 3662 | static int marker_block_index = MARKER_BLOCK_SIZE; |
| 3663 | 3663 | ||
| 3664 | static union Lisp_Misc *marker_free_list; | 3664 | static union Lisp_Misc *misc_free_list; |
| 3665 | 3665 | ||
| 3666 | /* Return a newly allocated Lisp_Misc object of specified TYPE. */ | 3666 | /* Return a newly allocated Lisp_Misc object of specified TYPE. */ |
| 3667 | 3667 | ||
| @@ -3672,10 +3672,10 @@ allocate_misc (enum Lisp_Misc_Type type) | |||
| 3672 | 3672 | ||
| 3673 | MALLOC_BLOCK_INPUT; | 3673 | MALLOC_BLOCK_INPUT; |
| 3674 | 3674 | ||
| 3675 | if (marker_free_list) | 3675 | if (misc_free_list) |
| 3676 | { | 3676 | { |
| 3677 | XSETMISC (val, marker_free_list); | 3677 | XSETMISC (val, misc_free_list); |
| 3678 | marker_free_list = marker_free_list->u_free.chain; | 3678 | misc_free_list = misc_free_list->u_free.chain; |
| 3679 | } | 3679 | } |
| 3680 | else | 3680 | else |
| 3681 | { | 3681 | { |
| @@ -3707,8 +3707,8 @@ void | |||
| 3707 | free_misc (Lisp_Object misc) | 3707 | free_misc (Lisp_Object misc) |
| 3708 | { | 3708 | { |
| 3709 | XMISCANY (misc)->type = Lisp_Misc_Free; | 3709 | XMISCANY (misc)->type = Lisp_Misc_Free; |
| 3710 | XMISC (misc)->u_free.chain = marker_free_list; | 3710 | XMISC (misc)->u_free.chain = misc_free_list; |
| 3711 | marker_free_list = XMISC (misc); | 3711 | misc_free_list = XMISC (misc); |
| 3712 | consing_since_gc -= sizeof (union Lisp_Misc); | 3712 | consing_since_gc -= sizeof (union Lisp_Misc); |
| 3713 | total_free_markers++; | 3713 | total_free_markers++; |
| 3714 | } | 3714 | } |
| @@ -7079,7 +7079,7 @@ sweep_misc (void) | |||
| 7079 | /* Put all unmarked misc's on free list. For a marker, first | 7079 | /* Put all unmarked misc's on free list. For a marker, first |
| 7080 | unchain it from the buffer it points into. */ | 7080 | unchain it from the buffer it points into. */ |
| 7081 | 7081 | ||
| 7082 | marker_free_list = 0; | 7082 | misc_free_list = 0; |
| 7083 | 7083 | ||
| 7084 | for (mblk = marker_block; mblk; mblk = *mprev) | 7084 | for (mblk = marker_block; mblk; mblk = *mprev) |
| 7085 | { | 7085 | { |
| @@ -7106,8 +7106,8 @@ sweep_misc (void) | |||
| 7106 | We could leave the type alone, since nobody checks it, | 7106 | We could leave the type alone, since nobody checks it, |
| 7107 | but this might catch bugs faster. */ | 7107 | but this might catch bugs faster. */ |
| 7108 | mblk->markers[i].m.u_marker.type = Lisp_Misc_Free; | 7108 | mblk->markers[i].m.u_marker.type = Lisp_Misc_Free; |
| 7109 | mblk->markers[i].m.u_free.chain = marker_free_list; | 7109 | mblk->markers[i].m.u_free.chain = misc_free_list; |
| 7110 | marker_free_list = &mblk->markers[i].m; | 7110 | misc_free_list = &mblk->markers[i].m; |
| 7111 | this_free++; | 7111 | this_free++; |
| 7112 | } | 7112 | } |
| 7113 | else | 7113 | else |
| @@ -7124,7 +7124,7 @@ sweep_misc (void) | |||
| 7124 | { | 7124 | { |
| 7125 | *mprev = mblk->next; | 7125 | *mprev = mblk->next; |
| 7126 | /* Unhook from the free list. */ | 7126 | /* Unhook from the free list. */ |
| 7127 | marker_free_list = mblk->markers[0].m.u_free.chain; | 7127 | misc_free_list = mblk->markers[0].m.u_free.chain; |
| 7128 | lisp_free (mblk); | 7128 | lisp_free (mblk); |
| 7129 | } | 7129 | } |
| 7130 | else | 7130 | else |