Fix warnings

Author: JohnSully

Makefile

@@ -1,7 +1,7 @@
 
 # Note: -Bsymbolic is necessary to ensure new/delete goes through the overrides in new.cpp and is tracked
 LD_FLAGS+=  -L$(V8_PATH)/out.gn/x64.release.sample/obj/ -lv8_monolith -lpthread -lstdc++fs -static-libstdc++ -Wl,-Bsymbolic 
-CXX_FLAGS+= -std=c++17 -fvisibility=hidden -fPIC -O2 -g -isystem $(V8_PATH)/include -DV8_COMPRESS_POINTERS
+CXX_FLAGS+= -Wall -Wextra -std=c++17 -fvisibility=hidden -fPIC -O2 -g -isystem $(V8_PATH)/include -DV8_COMPRESS_POINTERS
 
 MODULE_OBJS = js.o module.o sha256.o new.o
 

js.cpp

@@ -113,6 +113,8 @@ std::experimental::filesystem::path find_module(std::experimental::filesystem::p
         }
         wdir = wdir.parent_path();
     } while (!wdir.empty());
+    
+    return name;
 }
 
 /*static*/ void JSContext::RequireCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
@@ -199,9 +201,9 @@ std::experimental::filesystem::path find_module(std::experimental::filesystem::p
     }
 
     bool flagT;
-    auto maybeInstantiated = module->InstantiateModule(context, [](v8::Local<v8::Context> context, // "main.mjs"
-                                      v8::Local<v8::String> specifier, // "some thing"
-                                      v8::Local<v8::Module> referrer) -> v8::MaybeLocal<v8::Module> {
+    auto maybeInstantiated = module->InstantiateModule(context, [](v8::Local<v8::Context> /*context*/, // "main.mjs"
+                                      v8::Local<v8::String> /*specifier*/, // "some thing"
+                                      v8::Local<v8::Module> /*referrer*/) -> v8::MaybeLocal<v8::Module> {
         return v8::Local<v8::Module>();
     });
     if (!maybeInstantiated.To(&flagT) || !flagT)

module.cpp

@@ -123,7 +123,7 @@ void KeyDBExecuteCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
     v8::String::Utf8Value fnName(isolate, vfnName);
 
     std::vector<RedisModuleString*> vecstrs;
-    for (size_t iarg = 1; iarg < args.Length(); ++iarg)
+    for (int iarg = 1; iarg < args.Length(); ++iarg)
     {
         v8::String::Utf8Value argument(isolate, args[iarg]);
         vecstrs.push_back(RedisModule_CreateString(g_ctx, *argument, argument.length()));
@@ -331,11 +331,11 @@ int evaljs_command(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
     return REDISMODULE_OK;
 }
 
-int run_startup_script(RedisModuleCtx *ctx, const char *rgchPath, size_t cchPath)
+int run_startup_script(RedisModuleCtx *ctx, const char *szPath)
 {
     KeyDBContext ctxsav(ctx);
 
-    std::ifstream file(rgchPath, std::ios::binary | std::ios::ate);
+    std::ifstream file(szPath, std::ios::binary | std::ios::ate);
     std::streamsize size = file.tellg();
     if (size == -1)
     {
@@ -365,12 +365,19 @@ int run_startup_script(RedisModuleCtx *ctx, const char *rgchPath, size_t cchPath
     return REDISMODULE_OK;
 }
 
+int ReplyWithCString(RedisModuleCtx *ctx, const char *sz)
+{
+    return RedisModule_ReplyWithStringBuffer(ctx, sz, strlen(sz));
+}
+
 extern "C" int __attribute__((visibility("default"))) RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
 {
-    printf("argc: %d\n", argc);
     if (RedisModule_Init(ctx,"modjs",1,REDISMODULE_APIVER_1) == REDISMODULE_ERR)
         return REDISMODULE_ERR;
 
+    if (RedisModule_ReplyWithCString == nullptr)
+        RedisModule_ReplyWithCString = ReplyWithCString;
+
     if (RedisModule_CreateCommand(ctx,"evaljs", evaljs_command,"write deny-oom random",0,0,0) == REDISMODULE_ERR)
         return REDISMODULE_ERR;
 
@@ -389,7 +396,7 @@ extern "C" int __attribute__((visibility("default"))) RedisModule_OnLoad(RedisMo
             path.remove_filename();
             path /= "bootstrap.js";
             std::string strPath = path.string();
-            if (run_startup_script(ctx, strPath.data(), strPath.size()) == REDISMODULE_ERR)
+            if (run_startup_script(ctx, strPath.c_str()) == REDISMODULE_ERR)
             {
                 RedisModule_Log(ctx, "warning", "failed to run bootstrap.js, ensure this is located in the same location as the .so");
                 return REDISMODULE_ERR;
@@ -408,7 +415,7 @@ extern "C" int __attribute__((visibility("default"))) RedisModule_OnLoad(RedisMo
         size_t cchPath;
         const char *rgchPath = RedisModule_StringPtrLen(argv[iarg], &cchPath);
 
-        if (run_startup_script(ctx, rgchPath, cchPath) == REDISMODULE_ERR)
+        if (run_startup_script(ctx, rgchPath) == REDISMODULE_ERR)
             return REDISMODULE_ERR;
     }