From 97f527fde8bb6913a5742329faf7e121181b4369 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 1 Jul 2023 19:29:22 +1200 Subject: [PATCH] Remove unnecessary (char *) casts --- lcl.c | 6 +++--- lfile.c | 22 +++++++++++----------- lprocess.c | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lcl.c b/lcl.c index cf8b04d..9fd610b 100644 --- a/lcl.c +++ b/lcl.c @@ -24,7 +24,7 @@ static void fmesg(lua_State *L, FILE* f, int shift) { int paramc, i; - char *progname; /* argv[0] */ + const char *progname; /* argv[0] */ paramc = lua_gettop(L); /* get parameter count */ @@ -32,7 +32,7 @@ fmesg(lua_State *L, FILE* f, int shift) if (lua_type(L, -1) != LUA_TSTRING) { /* if argv[0] is not a string... */ luaL_error(L, "invalid argument table passed (must have an string in index [0])"); } - progname = (char *)lua_tostring(L, -1); /* set progname to argv[0] */ + progname = lua_tostring(L, -1); /* set progname to argv[0] */ /* format using string.format */ lua_getglobal(L, "string"); @@ -229,7 +229,7 @@ cl_parseopts(lua_State *L) /* parameter type checking */ luaL_checktype(L, 1, LUA_TTABLE); - strlcpy(optstring, (char *)luaL_checkstring(L, 2), lua_rawlen(L, 2) * sizeof(char *)); + strlcpy(optstring, luaL_checkstring(L, 2), lua_rawlen(L, 2) * sizeof(char *)); luaL_checktype(L, 3, LUA_TFUNCTION); argc = (int)lua_rawlen(L, 1) + 1; /* get argv length */ diff --git a/lfile.c b/lfile.c index e5bbd4c..29a4f22 100644 --- a/lfile.c +++ b/lfile.c @@ -38,11 +38,11 @@ static int file_basename(lua_State *L) { - char *path; /* parameter 1 (string) */ - char *ret; + const char *path; /* parameter 1 (string) */ + const char *ret; - path = (char *)luaL_checkstring(L, 1); - ret = basename(path); + path = luaL_checkstring(L, 1); + ret = basename(path); if (ret == NULL && errno == ENAMETOOLONG) /* check if path is too long */ return lfail(L, "pathname too long"); @@ -70,11 +70,11 @@ file_basename(lua_State *L) static int file_dirname(lua_State *L) { - char *path; /* parameter 1 (string) */ - char *ret; + const char *path; /* parameter 1 (string) */ + const char *ret; - path = (char *)luaL_checkstring(L, 1); - ret = dirname(path); + path = luaL_checkstring(L, 1); + ret = dirname(path); if (ret == NULL && errno == ENAMETOOLONG) /* check if path is too long */ return lfail(L, "pathname too long"); @@ -269,8 +269,8 @@ file.workdir(environment.get("HOME")) static int file_workdir(lua_State *L) { - char *workdir; /* parameter 1 (string) */ - char *buffer; /* buffer used by getcwd() */ + const char *workdir; /* parameter 1 (string) */ + char *buffer; /* buffer used by getcwd() */ char *ret; if (lua_isnoneornil(L, 1)) { /* if first argument was not given... */ buffer = malloc(sizeof(char *) * 512); @@ -305,7 +305,7 @@ file_workdir(lua_State *L) return 0; } else { - workdir = (char *)luaL_checkstring(L, 1); + workdir = luaL_checkstring(L, 1); if (chdir(workdir) == 0) { lua_pushboolean(L, 1); diff --git a/lprocess.c b/lprocess.c index fadf391..38e8b99 100644 --- a/lprocess.c +++ b/lprocess.c @@ -93,12 +93,12 @@ static const char *signals[] = { static int process_pid(lua_State *L) { - char *process; /* parameter 1 (string) */ - char *command; /* pidof command buffer */ - char *buffer; /* pidof reading buffer */ - long pid; /* pid to return to Lua */ - size_t pidmax; /* length passed to getline */ - ssize_t ret; /* return value of getline */ + const char *process; /* parameter 1 (string) */ + char *command; /* pidof command buffer */ + char *buffer; /* pidof reading buffer */ + long pid; /* pid to return to Lua */ + size_t pidmax; /* length passed to getline */ + ssize_t ret; /* return value of getline */ FILE *p; if (lua_isnoneornil(L, 1)) { /* check if first parameter wasn't given */ @@ -106,7 +106,7 @@ process_pid(lua_State *L) return 1; } - process = (char *)luaL_checkstring(L, 1); + process = luaL_checkstring(L, 1); command = calloc(1, PROCESS_MAX * sizeof(char *)); /* construct pidof command */