From 695def20efc462667bf73016df2195558540bf93 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 25 Apr 2016 15:33:12 +0300 Subject: Get rid of goto in lfs_g_setmode --- src/lfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lfs.c b/src/lfs.c index 8b4cfd2..68040d4 100644 --- a/src/lfs.c +++ b/src/lfs.c @@ -354,11 +354,10 @@ static int lfs_g_setmode (lua_State *L, FILE *f, int arg) { for (i = 0; modenames[i] != NULL; i++) { if (mode[i] == res) { lua_pushstring(L, modenames[i]); - goto exit; + return 2; } } lua_pushnil(L); - exit: return 2; } else { int en = errno; -- cgit v1.2.3-55-g6feb From 655ec8baa3e1e2c3f0fc13845f9b3f86416ec944 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 25 Apr 2016 15:36:37 +0300 Subject: Use pusherror in lfs_g_setmode --- src/lfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lfs.c b/src/lfs.c index 68040d4..df7ec2c 100644 --- a/src/lfs.c +++ b/src/lfs.c @@ -360,11 +360,7 @@ static int lfs_g_setmode (lua_State *L, FILE *f, int arg) { lua_pushnil(L); return 2; } else { - int en = errno; - lua_pushnil(L); - lua_pushfstring(L, "%s", strerror(en)); - lua_pushinteger(L, en); - return 3; + return pusherror(L, NULL); } } -- cgit v1.2.3-55-g6feb From c1e9c70214f9731b32a9ed713963e0326d167aa0 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 25 Apr 2016 15:42:54 +0300 Subject: Don't pass Lua state to lfs_setmode, it's always unused --- src/lfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lfs.c b/src/lfs.c index df7ec2c..fb8099f 100644 --- a/src/lfs.c +++ b/src/lfs.c @@ -117,10 +117,10 @@ typedef struct dir_data { #ifdef _WIN32 #ifdef __BORLANDC__ - #define lfs_setmode(L,file,m) ((void)L, setmode(_fileno(file), m)) + #define lfs_setmode(file, m) (setmode(_fileno(file), m)) #define STAT_STRUCT struct stati64 #else - #define lfs_setmode(L,file,m) ((void)L, _setmode(_fileno(file), m)) + #define lfs_setmode(file, m) (_setmode(_fileno(file), m)) #define STAT_STRUCT struct _stati64 #endif #define STAT_FUNC _stati64 @@ -128,7 +128,7 @@ typedef struct dir_data { #else #define _O_TEXT 0 #define _O_BINARY 0 -#define lfs_setmode(L,file,m) ((void)L, (void)file, (void)m, 0) +#define lfs_setmode(file, m) ((void)file, (void)m, 0) #define STAT_STRUCT struct stat #define STAT_FUNC stat #define LSTAT_FUNC lstat @@ -347,7 +347,7 @@ static int lfs_g_setmode (lua_State *L, FILE *f, int arg) { static const int mode[] = {_O_BINARY, _O_TEXT}; static const char *const modenames[] = {"binary", "text", NULL}; int op = luaL_checkoption(L, arg, NULL, modenames); - int res = lfs_setmode(L, f, mode[op]); + int res = lfs_setmode(f, mode[op]); if (res != -1) { int i; lua_pushboolean(L, 1); -- cgit v1.2.3-55-g6feb