diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-06-22 11:41:48 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2023-06-22 11:41:48 -0300 |
commit | ab6a94952215b1f66436d8eeebded1dad9fa5409 (patch) | |
tree | ba66254537defc76602ce351d962b899ddfe1b29 /lstate.c | |
parent | 86e8039a72646cd9192fd08a6f1771c90b872ff6 (diff) | |
parent | ea39042e13645f63713425c05cc9ee4cfdcf0a40 (diff) | |
download | lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.gz lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.tar.bz2 lua-ab6a94952215b1f66436d8eeebded1dad9fa5409.zip |
Merge branch 'master' into nextversion
Diffstat (limited to 'lstate.c')
-rw-r--r-- | lstate.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -88,7 +88,7 @@ CallInfo *luaE_extendCI (lua_State *L) { | |||
88 | /* | 88 | /* |
89 | ** free all CallInfo structures not in use by a thread | 89 | ** free all CallInfo structures not in use by a thread |
90 | */ | 90 | */ |
91 | void luaE_freeCI (lua_State *L) { | 91 | static void freeCI (lua_State *L) { |
92 | CallInfo *ci = L->ci; | 92 | CallInfo *ci = L->ci; |
93 | CallInfo *next = ci->next; | 93 | CallInfo *next = ci->next; |
94 | ci->next = NULL; | 94 | ci->next = NULL; |
@@ -173,7 +173,7 @@ static void freestack (lua_State *L) { | |||
173 | if (L->stack.p == NULL) | 173 | if (L->stack.p == NULL) |
174 | return; /* stack not completely built yet */ | 174 | return; /* stack not completely built yet */ |
175 | L->ci = &L->base_ci; /* free the entire 'ci' list */ | 175 | L->ci = &L->base_ci; /* free the entire 'ci' list */ |
176 | luaE_freeCI(L); | 176 | freeCI(L); |
177 | lua_assert(L->nci == 0); | 177 | lua_assert(L->nci == 0); |
178 | luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK); /* free stack */ | 178 | luaM_freearray(L, L->stack.p, stacksize(L) + EXTRA_STACK); /* free stack */ |
179 | } | 179 | } |
@@ -309,7 +309,7 @@ int luaE_resetthread (lua_State *L, int status) { | |||
309 | } | 309 | } |
310 | 310 | ||
311 | 311 | ||
312 | LUA_API int lua_resetthread (lua_State *L, lua_State *from) { | 312 | LUA_API int lua_closethread (lua_State *L, lua_State *from) { |
313 | int status; | 313 | int status; |
314 | lua_lock(L); | 314 | lua_lock(L); |
315 | L->nCcalls = (from) ? getCcalls(from) : 0; | 315 | L->nCcalls = (from) ? getCcalls(from) : 0; |