Skip to content

Commit b75e66d

Browse files
committed
Renames struct buf to struct buffer to match corresponding Lisp datatype name
1 parent 0e2cda2 commit b75e66d

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/gcfinal.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,12 @@
7474
#define BucketIndex(n) min(integerlength(n), MAXBUCKETINDEX)
7575
#define FreeBlockChainN(n) ((POINTERMASK & *FreeBlockBuckets_word) + 2 * BucketIndex(n))
7676

77+
/*
78+
* Declaration of buffer must be identical layout to Lisp BUFFER datatype in PMAP.
79+
*/
7780
#ifndef BYTESWAP
7881
#ifdef BIGVM
79-
struct buf {
82+
struct buffer {
8083
LispPTR filepage;
8184
LispPTR vmempage;
8285
LispPTR buffernext;
@@ -87,7 +90,7 @@ struct buf {
8790
unsigned sysnext : 28;
8891
};
8992
#else
90-
struct buf {
93+
struct buffer {
9194
LispPTR filepage;
9295
LispPTR vmempage;
9396
LispPTR buffernext;
@@ -100,7 +103,7 @@ struct buf {
100103
#endif /* BIGVM */
101104
#else
102105
#ifdef BIGVM
103-
struct buf {
106+
struct buffer {
104107
LispPTR filepage;
105108
LispPTR vmempage;
106109
LispPTR buffernext;
@@ -111,7 +114,7 @@ struct buf {
111114
unsigned noreference : 1;
112115
};
113116
#else
114-
struct buf {
117+
struct buffer {
115118
LispPTR filepage;
116119
LispPTR vmempage;
117120
LispPTR buffernext;
@@ -140,10 +143,10 @@ static int integerlength(unsigned int n) {
140143

141144
static LispPTR findptrsbuffer(LispPTR ptr) {
142145
LispPTR buf;
143-
struct buf *buf_np;
146+
struct buffer *buf_np;
144147
buf = *System_Buffer_List_word;
145148
while (buf != NIL) {
146-
buf_np = (struct buf *)NativeAligned4FromLAddr(buf);
149+
buf_np = (struct buffer *)NativeAligned4FromLAddr(buf);
147150
if (ptr == buf_np->vmempage) {
148151
return (buf);
149152
}
@@ -165,11 +168,11 @@ static LispPTR findptrsbuffer(LispPTR ptr) {
165168

166169
LispPTR releasingvmempage(LispPTR ptr) {
167170
LispPTR buffer = findptrsbuffer(ptr);
168-
struct buf *buffer_np;
171+
struct buffer *buffer_np;
169172

170173
if (buffer == NIL) return (NIL); /* Not in use, OK to reclaim it */
171174

172-
buffer_np = (struct buf *)NativeAligned4FromLAddr(buffer);
175+
buffer_np = (struct buffer *)NativeAligned4FromLAddr(buffer);
173176
buffer_np->noreference = T; /* Mark the buffer free to use ?? */
174177
return (ATOM_T);
175178
}

0 commit comments

Comments
 (0)