Makefile LD_FLAGS, fixes warnings and an ommision

Separates the linker flags in the Makefiles to avoid errors on OSX
with clang, as suggested by @neomantra in #5.

Resolves a couple of type warnings and fixes and uses a variable
as suggested by @neomantra in #6.

Author: itamarhaber

rmutil/Makefile

@@ -3,7 +3,8 @@ ifndef RM_INCLUDE_DIR
 	RM_INCLUDE_DIR=../
 endif
 
-CFLAGS = -g -fPIC -lc -lm -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
+CFLAGS = -g -fPIC -O3 -std=gnu99 -I$(RM_INCLUDE_DIR) -Wall -Wno-unused-function
+LDFLAGS = -g -lc -lm
 CC=gcc
 
 OBJS=util.o strings.o sds.o vector.o heap.o priority_queue.o

src/Makefile

@@ -19,7 +19,8 @@ else
         SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup
 endif
 
-CFLAGS = -I$(RM_INCLUDE_DIR) -g -fPIC -lc -lm -O3 -std=gnu99 
+CFLAGS = -I$(RM_INCLUDE_DIR) -g -fPIC -O3 -std=gnu99 -Wall
+LDFLAGS = -g -lc -lm
 CC=gcc
 .SUFFIXES: .c .so .o
 

src/rxkeys.c

@@ -87,7 +87,7 @@ int PKeysCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
   RedisModule_ReplyWithArray(ctx, REDISMODULE_POSTPONED_ARRAY_LEN);
   size_t length = 0;
   RedisModuleString *scursor = RedisModule_CreateStringFromLongLong(ctx, 0);
-  unsigned long long lcursor;
+  long long lcursor;
   do {
     RedisModuleCallReply *rep = RedisModule_Call(ctx, "SCAN", "s", scursor);
 
@@ -139,7 +139,7 @@ int PDelCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
 
   /* Scan the keyspace. */
   RedisModuleString *scursor = RedisModule_CreateStringFromLongLong(ctx, 0);
-  unsigned long long lcursor;
+  long long lcursor;
   unsigned long long deleted = 0;
   do {
     RedisModuleCallReply *rep = RedisModule_Call(ctx, "SCAN", "s", scursor);
@@ -163,7 +163,7 @@ int PDelCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
     while (matched--) {
       RedisModuleString *str;
       Vector_Get(matches, matched, &str);
-      (RedisModuleString *)&matches
+      str = (RedisModuleString *)&matches
           ->data[matched * sizeof(RedisModuleString *)];
       RedisModule_FreeString(ctx, str);
     }