From 448c435b1b5ff747d0d84c49a23435a83f0d40ac Mon Sep 17 00:00:00 2001
From: YoongHM <yoonghm@users.noreply.github.com>
Date: Tue, 29 Sep 2020 22:10:54 +0800
Subject: [PATCH] Fix compilation warnings in Lua and jemalloc dependencies
 (#7785)

- The argument `u` in for `ar` is ignored (and generates warnings since `D` became the default.
  All it does is avoid updating unchanged objects (shouldn't have any impact on our build)
- Enable `LUA_USE_MKSTEMP` to force the use of `mkstemp()` instead of `tmpname()` (which is dead
  code in redis anyway).
- Remove unused variable `c` in `f_parser()`
- Removed misleadingly indented space in `luaL_loadfile()` and ``addfield()`

Co-authored-by: Oran Agra <oran@redislabs.com>
---
 deps/Makefile              | 4 ++--
 deps/jemalloc/configure.ac | 2 +-
 deps/lua/src/lauxlib.c     | 2 +-
 deps/lua/src/ldo.c         | 2 +-
 deps/lua/src/ltablib.c     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deps/Makefile b/deps/Makefile
index b90bbd2b7..ff16ee9e1 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -69,13 +69,13 @@ ifeq ($(uname_S),SunOS)
 	LUA_CFLAGS= -D__C99FEATURES__=1
 endif
 
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
+LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
 LUA_LDFLAGS+= $(LDFLAGS)
 # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
 # challenging to cross-compile lua (and redis).  These defines make it easier
 # to fit redis into cross-compilation environments, which typically set AR.
 AR=ar
-ARFLAGS=rcu
+ARFLAGS=rc
 
 lua: .make-prerequisites
 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
diff --git a/deps/jemalloc/configure.ac b/deps/jemalloc/configure.ac
index a6a08db08..afa5df800 100644
--- a/deps/jemalloc/configure.ac
+++ b/deps/jemalloc/configure.ac
@@ -512,7 +512,7 @@ CTARGET='-o $@'
 LDTARGET='-o $@'
 TEST_LD_MODE=
 EXTRA_LDFLAGS=
-ARFLAGS='crus'
+ARFLAGS='crs'
 AROUT=' $@'
 CC_MM=1
 
diff --git a/deps/lua/src/lauxlib.c b/deps/lua/src/lauxlib.c
index 10f14e2c0..751f1e887 100644
--- a/deps/lua/src/lauxlib.c
+++ b/deps/lua/src/lauxlib.c
@@ -575,7 +575,7 @@ LUALIB_API int luaL_loadfile (lua_State *L, const char *filename) {
     if (lf.f == NULL) return errfile(L, "reopen", fnameindex);
     /* skip eventual `#!...' */
    while ((c = getc(lf.f)) != EOF && c != LUA_SIGNATURE[0]) ;
-    lf.extraline = 0;
+   lf.extraline = 0;
   }
   ungetc(c, lf.f);
   status = lua_load(L, getF, &lf, lua_tostring(L, -1));
diff --git a/deps/lua/src/ldo.c b/deps/lua/src/ldo.c
index 939940a4c..e641dfcd9 100644
--- a/deps/lua/src/ldo.c
+++ b/deps/lua/src/ldo.c
@@ -493,7 +493,7 @@ static void f_parser (lua_State *L, void *ud) {
   Proto *tf;
   Closure *cl;
   struct SParser *p = cast(struct SParser *, ud);
-  int c = luaZ_lookahead(p->z);
+  luaZ_lookahead(p->z);
   luaC_checkGC(L);
   tf = (luaY_parser)(L, p->z,
                                                              &p->buff, p->name);
diff --git a/deps/lua/src/ltablib.c b/deps/lua/src/ltablib.c
index b6d9cb4ac..0bdac7f6c 100644
--- a/deps/lua/src/ltablib.c
+++ b/deps/lua/src/ltablib.c
@@ -137,7 +137,7 @@ static void addfield (lua_State *L, luaL_Buffer *b, int i) {
   if (!lua_isstring(L, -1))
     luaL_error(L, "invalid value (%s) at index %d in table for "
                   LUA_QL("concat"), luaL_typename(L, -1), i);
-    luaL_addvalue(b);
+  luaL_addvalue(b);
 }