From baffc37f5c8d15c03da0ce689bdecadc1219fe99 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Wed, 18 Jan 2006 09:49:12 -0200 Subject: [PATCH] detail --- lbaselib.c | 4 ++-- liolib.c | 9 +++++---- ltable.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lbaselib.c b/lbaselib.c index 8529414d..39e498de 100644 --- a/lbaselib.c +++ b/lbaselib.c @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.187 2005/12/27 17:10:11 roberto Exp roberto $ +** $Id: lbaselib.c,v 1.188 2005/12/29 15:32:11 roberto Exp roberto $ ** Basic library ** See Copyright Notice in lua.h */ @@ -201,7 +201,7 @@ static int luaB_collectgarbage (lua_State *L) { switch (optsnum[o]) { case LUA_GCCOUNT: { int b = lua_gc(L, LUA_GCCOUNTB, 0); - lua_pushnumber(L, ((lua_Number)res*1024 + b)/1024); + lua_pushnumber(L, res + ((lua_Number)b/1024)); return 1; } case LUA_GCSTEP: { diff --git a/liolib.c b/liolib.c index fc059e2e..f55f7a63 100644 --- a/liolib.c +++ b/liolib.c @@ -1,5 +1,5 @@ /* -** $Id: liolib.c,v 2.69 2005/10/19 13:05:11 roberto Exp roberto $ +** $Id: liolib.c,v 2.70 2005/12/29 15:32:11 roberto Exp roberto $ ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ @@ -28,6 +28,7 @@ static const char *const fnames[] = {"input", "output"}; static int pushresult (lua_State *L, int i, const char *filename) { + int en = errno; /* calls to Lua API may change this value */ if (i) { lua_pushboolean(L, 1); return 1; @@ -35,10 +36,10 @@ static int pushresult (lua_State *L, int i, const char *filename) { else { lua_pushnil(L); if (filename) - lua_pushfstring(L, "%s: %s", filename, strerror(errno)); + lua_pushfstring(L, "%s: %s", filename, strerror(en)); else - lua_pushfstring(L, "%s", strerror(errno)); - lua_pushinteger(L, errno); + lua_pushfstring(L, "%s", strerror(en)); + lua_pushinteger(L, en); return 3; } } diff --git a/ltable.c b/ltable.c index 0e80237c..b68d1486 100644 --- a/ltable.c +++ b/ltable.c @@ -1,5 +1,5 @@ /* -** $Id: ltable.c,v 2.30 2006/01/10 12:51:53 roberto Exp roberto $ +** $Id: ltable.c,v 2.31 2006/01/10 13:13:06 roberto Exp roberto $ ** Lua tables (hash) ** See Copyright Notice in lua.h */ @@ -122,7 +122,7 @@ static int arrayindex (const TValue *key) { lua_Number n = nvalue(key); int k; lua_number2int(k, n); - if (luai_numeq(cast_num(k), nvalue(key))) + if (luai_numeq(cast_num(k), n)) return k; } return -1; /* `key' did not match some condition */