From e8baaae47eab053aa48d9995a63e3bc7f073b8ef Mon Sep 17 00:00:00 2001 From: John Sully Date: Sun, 7 Apr 2019 15:24:23 -0400 Subject: [PATCH] Make t_string C++ Former-commit-id: 9f95d8b38f837097f5041086e4af6fc8dcb9bd78 --- src/notify.c | 2 +- src/server.h | 2 +- src/{t_string.c => t_string.cpp} | 40 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 22 deletions(-) rename src/{t_string.c => t_string.cpp} (93%) diff --git a/src/notify.c b/src/notify.c index 2213c5e9a..e2726be40 100644 --- a/src/notify.c +++ b/src/notify.c @@ -96,7 +96,7 @@ sds keyspaceEventsFlagsToString(int flags) { * 'event' is a C string representing the event name. * 'key' is a Redis object representing the key name. * 'dbid' is the database ID where the key lives. */ -void notifyKeyspaceEvent(int type, char *event, robj *key, int dbid) { +void notifyKeyspaceEvent(int type, const char *event, robj *key, int dbid) { sds chan; robj *chanobj, *eventobj; int len = -1; diff --git a/src/server.h b/src/server.h index de4a5b2d6..9438a33ea 100644 --- a/src/server.h +++ b/src/server.h @@ -2033,7 +2033,7 @@ int listMatchPubsubPattern(void *a, void *b); int pubsubPublishMessage(robj *channel, robj *message); /* Keyspace events notification */ -void notifyKeyspaceEvent(int type, char *event, robj *key, int dbid); +void notifyKeyspaceEvent(int type, const char *event, robj *key, int dbid); int keyspaceEventsStringToFlags(char *classes); sds keyspaceEventsFlagsToString(int flags); diff --git a/src/t_string.c b/src/t_string.cpp similarity index 93% rename from src/t_string.c rename to src/t_string.cpp index 4148538ae..c01301416 100644 --- a/src/t_string.c +++ b/src/t_string.cpp @@ -100,7 +100,7 @@ void setCommand(client *c) { int flags = OBJ_SET_NO_FLAGS; for (j = 3; j < c->argc; j++) { - char *a = ptrFromObj(c->argv[j]); + const char *a = (const char*)ptrFromObj(c->argv[j]); robj *next = (j == c->argc-1) ? NULL : c->argv[j+1]; if ((a[0] == 'n' || a[0] == 'N') && @@ -184,7 +184,7 @@ void getsetCommand(client *c) { void setrangeCommand(client *c) { robj *o; long offset; - sds value = ptrFromObj(c->argv[3]); + sds value = (sds)ptrFromObj(c->argv[3]); if (getLongFromObjectOrReply(c,c->argv[2],&offset,NULL) != C_OK) return; @@ -231,14 +231,14 @@ void setrangeCommand(client *c) { } if (sdslen(value) > 0) { - o->m_ptr = sdsgrowzero(ptrFromObj(o),offset+sdslen(value)); + o->m_ptr = sdsgrowzero((sds)ptrFromObj(o),offset+sdslen(value)); memcpy((char*)ptrFromObj(o)+offset,value,sdslen(value)); signalModifiedKey(c->db,c->argv[1]); notifyKeyspaceEvent(NOTIFY_STRING, "setrange",c->argv[1],c->db->id); server.dirty++; } - addReplyLongLong(c,sdslen(ptrFromObj(o))); + addReplyLongLong(c,sdslen((sds)ptrFromObj(o))); } void getrangeCommand(client *c) { @@ -258,7 +258,7 @@ void getrangeCommand(client *c) { str = llbuf; strlen = ll2string(llbuf,sizeof(llbuf),(long)ptrFromObj(o)); } else { - str = ptrFromObj(o); + str = (char*)ptrFromObj(o); strlen = sdslen(str); } @@ -338,7 +338,7 @@ void msetnxCommand(client *c) { void incrDecrCommand(client *c, long long incr) { long long value, oldvalue; - robj *o, *new; + robj *o, *newObj; o = lookupKeyWrite(c->db,c->argv[1]); if (o != NULL && checkType(c,o,OBJ_STRING)) return; @@ -356,21 +356,21 @@ void incrDecrCommand(client *c, long long incr) { (value < 0 || value >= OBJ_SHARED_INTEGERS) && value >= LONG_MIN && value <= LONG_MAX) { - new = o; + newObj = o; o->m_ptr = (void*)((long)value); } else { - new = createStringObjectFromLongLongForValue(value); + newObj = createStringObjectFromLongLongForValue(value); if (o) { - dbOverwrite(c->db,c->argv[1],new); + dbOverwrite(c->db,c->argv[1],newObj); } else { - dbAdd(c->db,c->argv[1],new); + dbAdd(c->db,c->argv[1],newObj); } } signalModifiedKey(c->db,c->argv[1]); notifyKeyspaceEvent(NOTIFY_STRING,"incrby",c->argv[1],c->db->id); server.dirty++; addReply(c,shared.colon); - addReply(c,new); + addReply(c,newObj); addReply(c,shared.crlf); } @@ -398,7 +398,7 @@ void decrbyCommand(client *c) { void incrbyfloatCommand(client *c) { long double incr, value; - robj *o, *new, *aux; + robj *o, *newObj, *aux; o = lookupKeyWrite(c->db,c->argv[1]); if (o != NULL && checkType(c,o,OBJ_STRING)) return; @@ -411,15 +411,15 @@ void incrbyfloatCommand(client *c) { addReplyError(c,"increment would produce NaN or Infinity"); return; } - new = createStringObjectFromLongDouble(value,1); + newObj = createStringObjectFromLongDouble(value,1); if (o) - dbOverwrite(c->db,c->argv[1],new); + dbOverwrite(c->db,c->argv[1],newObj); else - dbAdd(c->db,c->argv[1],new); + dbAdd(c->db,c->argv[1],newObj); signalModifiedKey(c->db,c->argv[1]); notifyKeyspaceEvent(NOTIFY_STRING,"incrbyfloat",c->argv[1],c->db->id); server.dirty++; - addReplyBulk(c,new); + addReplyBulk(c,newObj); /* Always replicate INCRBYFLOAT as a SET command with the final value * in order to make sure that differences in float precision or formatting @@ -427,7 +427,7 @@ void incrbyfloatCommand(client *c) { aux = createStringObject("SET",3); rewriteClientCommandArgument(c,0,aux); decrRefCount(aux); - rewriteClientCommandArgument(c,2,new); + rewriteClientCommandArgument(c,2,newObj); } void appendCommand(client *c) { @@ -448,14 +448,14 @@ void appendCommand(client *c) { /* "append" is an argument, so always an sds */ append = c->argv[2]; - totlen = stringObjectLen(o)+sdslen(ptrFromObj(append)); + totlen = stringObjectLen(o)+sdslen((sds)ptrFromObj(append)); if (checkStringLength(c,totlen) != C_OK) return; /* Append the value */ o = dbUnshareStringValue(c->db,c->argv[1],o); - o->m_ptr = sdscatlen(ptrFromObj(o),ptrFromObj(append),sdslen(ptrFromObj(append))); - totlen = sdslen(ptrFromObj(o)); + o->m_ptr = sdscatlen((sds)ptrFromObj(o),ptrFromObj(append),sdslen((sds)ptrFromObj(append))); + totlen = sdslen((sds)ptrFromObj(o)); } signalModifiedKey(c->db,c->argv[1]); notifyKeyspaceEvent(NOTIFY_STRING,"append",c->argv[1],c->db->id);