Use existing reply functions where possible

[redis.git] / src / db.c

diff --git a/src/db.c b/src/db.c
index 0dec95b1c5763a8ecea00b2a469cebf14ce5ffb4..4d119cf299ea05adb165b2ae918ae6d0e7dcf305 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -223,11 +223,9 @@ void keysCommand(redisClient *c) {
     sds pattern = c->argv[1]->ptr;
     int plen = sdslen(pattern);
     unsigned long numkeys = 0;
     sds pattern = c->argv[1]->ptr;
     int plen = sdslen(pattern);
     unsigned long numkeys = 0;

-    robj *lenobj = createObject(REDIS_STRING,NULL);
+    void *replylen = addDeferredMultiBulkLength(c);

 
     di = dictGetIterator(c->db->dict);
 
     di = dictGetIterator(c->db->dict);

-    addReply(c,lenobj);
-    decrRefCount(lenobj);

     while((de = dictNext(di)) != NULL) {
         sds key = dictGetEntryKey(de);
         robj *keyobj;
     while((de = dictNext(di)) != NULL) {
         sds key = dictGetEntryKey(de);
         robj *keyobj;


@@ -243,17 +241,15 @@ void keysCommand(redisClient *c) {
         }
     }
     dictReleaseIterator(di);
         }
     }
     dictReleaseIterator(di);

-    lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",numkeys);
+    setDeferredMultiBulkLength(c,replylen,numkeys);

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

-    addReplySds(c,
-        sdscatprintf(sdsempty(),":%lu\r\n",dictSize(c->db->dict)));
+    addReplyLongLong(c,dictSize(c->db->dict));

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

-    addReplySds(c,
-        sdscatprintf(sdsempty(),":%lu\r\n",server.lastsave));
+    addReplyLongLong(c,server.lastsave);

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


@@ -514,15 +510,14 @@ void expireatCommand(redisClient *c) {
 }
 
 void ttlCommand(redisClient *c) {
 }
 
 void ttlCommand(redisClient *c) {

-    time_t expire;
-    int ttl = -1;
+    time_t expire, ttl = -1;

 
     expire = getExpire(c->db,c->argv[1]);
     if (expire != -1) {
 
     expire = getExpire(c->db,c->argv[1]);
     if (expire != -1) {

-        ttl = (int) (expire-time(NULL));
+        ttl = (expire-time(NULL));

         if (ttl < 0) ttl = -1;
     }
         if (ttl < 0) ttl = -1;
     }

-    addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",ttl));
+    addReplyLongLong(c,(long long)ttl);

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