From 3684b3a8927b682f45df2d1a58b0410eee008fae Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 26 Nov 2018 18:55:05 +0100 Subject: RESP3: remove certain constants to spot places to fix. --- src/server.c | 5 ++--- src/server.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/server.c b/src/server.c index b686e2fca..e2534a4d1 100644 --- a/src/server.c +++ b/src/server.c @@ -1429,9 +1429,8 @@ void createSharedObjects(void) { shared.czero = createObject(OBJ_STRING,sdsnew(":0\r\n")); shared.cone = createObject(OBJ_STRING,sdsnew(":1\r\n")); shared.cnegone = createObject(OBJ_STRING,sdsnew(":-1\r\n")); - shared.nullbulk = createObject(OBJ_STRING,sdsnew("$-1\r\n")); - shared.nullmultibulk = createObject(OBJ_STRING,sdsnew("*-1\r\n")); - shared.emptymultibulk = createObject(OBJ_STRING,sdsnew("*0\r\n")); + shared.emptyarray = createObject(OBJ_STRING,sdsnew("*0\r\n")); + shared.null = createObject(OBJ_STRING,sdsnew("_\r\n")); shared.pong = createObject(OBJ_STRING,sdsnew("+PONG\r\n")); shared.queued = createObject(OBJ_STRING,sdsnew("+QUEUED\r\n")); shared.emptyscan = createObject(OBJ_STRING,sdsnew("*2\r\n$1\r\n0\r\n*0\r\n")); diff --git a/src/server.h b/src/server.h index 272db6621..2bb7e3650 100644 --- a/src/server.h +++ b/src/server.h @@ -782,8 +782,8 @@ struct moduleLoadQueueEntry { struct sharedObjectsStruct { robj *crlf, *ok, *err, *emptybulk, *czero, *cone, *cnegone, *pong, *space, - *colon, *nullbulk, *nullmultibulk, *queued, - *emptymultibulk, *wrongtypeerr, *nokeyerr, *syntaxerr, *sameobjecterr, + *colon, *queued, *null, + *emptyarray, *wrongtypeerr, *nokeyerr, *syntaxerr, *sameobjecterr, *outofrangeerr, *noscripterr, *loadingerr, *slowscripterr, *bgsaveerr, *masterdownerr, *roslaveerr, *execaborterr, *noautherr, *noreplicaserr, *busykeyerr, *oomerr, *plus, *messagebulk, *pmessagebulk, *subscribebulk, -- cgit v1.2.1