caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:/antirez/redis into unstable

Browse Source
This commit is contained in:
antirez 2016-05-30 12:47:28 +02:00
commit 18a513f86d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -55,7 +55,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm FINAL_LIBS=-lm -ldl
DEBUG=-g -ggdb DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)
@ -95,7 +95,7 @@ endif
ifeq ($(MALLOC),jemalloc) ifeq ($(MALLOC),jemalloc)
DEPENDENCY_TARGETS+= jemalloc DEPENDENCY_TARGETS+= jemalloc
FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
endif endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

3
src/redis-cli.c
View File

@ -284,7 +284,6 @@ static void cliIntegrateHelp(void) {
break; break;
} }
if (i != helpEntriesLen) continue; if (i != helpEntriesLen) continue;
printf("%s\n", cmdname);
helpEntriesLen++; helpEntriesLen++;
helpEntries = zrealloc(helpEntries,sizeof(helpEntry)*helpEntriesLen); helpEntries = zrealloc(helpEntries,sizeof(helpEntry)*helpEntriesLen);
@ -314,8 +313,6 @@ static void cliIntegrateHelp(void) {
new->org = ch; new->org = ch;
} }
freeReplyObject(reply); freeReplyObject(reply);
printf("%s\n", helpEntries[80].full);
} }
/* Output command help to stdout. */ /* Output command help to stdout. */