added a missing prototype from syncio.c in redis.h

[redis.git] / src / t_string.c

diff --git a/src/t_string.c b/src/t_string.c
index f55595c2b0cdad49a922c12cc4e76708845c8cc0..509c630a49540163980ef3aba678a6d9efbb9623 100644 (file)
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -12,12 +12,11 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir
         if (getLongFromObjectOrReply(c, expire, &seconds, NULL) != REDIS_OK)
             return;
         if (seconds <= 0) {
         if (getLongFromObjectOrReply(c, expire, &seconds, NULL) != REDIS_OK)
             return;
         if (seconds <= 0) {

-            addReplySds(c,sdsnew("-ERR invalid expire time in SETEX\r\n"));
+            addReplyError(c,"invalid expire time in SETEX");

             return;
         }
     }
 
             return;
         }
     }
 

-    if (nx) deleteIfVolatile(c->db,key);

     retval = dbAdd(c->db,key,val);
     if (retval == REDIS_ERR) {
         if (!nx) {
     retval = dbAdd(c->db,key,val);
     if (retval == REDIS_ERR) {
         if (!nx) {


@@ -80,7 +79,7 @@ void getsetCommand(redisClient *c) {
 void mgetCommand(redisClient *c) {
     int j;
 
 void mgetCommand(redisClient *c) {
     int j;
 

-    addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",c->argc-1));
+    addReplyMultiBulkLen(c,c->argc-1);

     for (j = 1; j < c->argc; j++) {
         robj *o = lookupKeyRead(c->db,c->argv[j]);
         if (o == NULL) {
     for (j = 1; j < c->argc; j++) {
         robj *o = lookupKeyRead(c->db,c->argv[j]);
         if (o == NULL) {


@@ -99,7 +98,7 @@ void msetGenericCommand(redisClient *c, int nx) {
     int j, busykeys = 0;
 
     if ((c->argc % 2) == 0) {
     int j, busykeys = 0;
 
     if ((c->argc % 2) == 0) {

-        addReplySds(c,sdsnew("-ERR wrong number of arguments for MSET\r\n"));
+        addReplyError(c,"wrong number of arguments for MSET");

         return;
     }
     /* Handle the NX flag. The MSETNX semantic is to return zero and don't
         return;
     }
     /* Handle the NX flag. The MSETNX semantic is to return zero and don't


@@ -212,7 +211,7 @@ void appendCommand(redisClient *c) {
     }
     touchWatchedKey(c->db,c->argv[1]);
     server.dirty++;
     }
     touchWatchedKey(c->db,c->argv[1]);
     server.dirty++;

-    addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",(unsigned long)totlen));
+    addReplyLongLong(c,totlen);

 }
 
 void substrCommand(redisClient *c) {
 }
 
 void substrCommand(redisClient *c) {