another missing free->zfree replacement fixed. Thanks to Ludo

diff --git a/Makefile b/Makefile
index bf9760f06fdee501e9de972a269974f79692cc89..e45899e9108020d8d71534b0135ce00b847d5a95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ anet.o: anet.c anet.h
 benchmark.o: benchmark.c ae.h anet.h sds.h adlist.h
 dict.o: dict.c dict.h
 redis-cli.o: redis-cli.c anet.h sds.h adlist.h
 benchmark.o: benchmark.c ae.h anet.h sds.h adlist.h
 dict.o: dict.c dict.h
 redis-cli.o: redis-cli.c anet.h sds.h adlist.h

-redis.o: redis.c ae.h sds.h anet.h dict.h adlist.h
+redis.o: redis.c ae.h sds.h anet.h dict.h adlist.h zmalloc.c zmalloc.h

 sds.o: sds.c sds.h
 sha1.o: sha1.c sha1.h
 zmalloc.o: zmalloc.c
 sds.o: sds.c sds.h
 sha1.o: sha1.c sha1.h
 zmalloc.o: zmalloc.c

diff --git a/TODO b/TODO
index 02595425b49541504bf3c47de632dfd8f04951e6..7d91a10331937c9a4b39e5006113e8c77c599a12 100644 (file)
--- a/TODO
+++ b/TODO
@@ -15,3 +15,22 @@ BETA 8 TODO
     $
 - Make Redis aware of the memory it is using thanks to getrusage() and report this info with the INFO command.
 - INFO command: clients, slave/master, requests/second in the last N seconds, memory usage, uptime, dirty, lastsave
     $
 - Make Redis aware of the memory it is using thanks to getrusage() and report this info with the INFO command.
 - INFO command: clients, slave/master, requests/second in the last N seconds, memory usage, uptime, dirty, lastsave

+
+FUTURE
+
+ROLLBACK command:
+
+    ROLLBACK UNSET x
+    SET x 10
+    EXPIRE x 3600
+    COMMIT
+
+    (multiple rollbacks are allowed)
+
+    or alternatively
+
+    TRANSACTION SET x 1000
+    TRANSACTION EXPIRE x 1000
+    COMMIT
+
+    but this sucks since there is no way to check the error message.

diff --git a/redis.c b/redis.c
index 04504eec201b01c12d171d589701b29d4dbce230..e6606f1822adafbb3801d03c4d75d82d0fea1e11 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2619,7 +2619,7 @@ static void sortCommand(redisClient *c) {
     /* Create a list of operations to perform for every sorted element.
      * Operations can be GET/DEL/INCR/DECR */
     operations = listCreate();
     /* Create a list of operations to perform for every sorted element.
      * Operations can be GET/DEL/INCR/DECR */
     operations = listCreate();

-    listSetFreeMethod(operations,free);
+    listSetFreeMethod(operations,zfree);

     j = 2;
 
     /* Now we need to protect sortval incrementing its count, in the future
     j = 2;
 
     /* Now we need to protect sortval incrementing its count, in the future

diff --git a/zmalloc.h b/zmalloc.h
index aaddb9ba8bc5b83a317e6dd3fc5f5eb7bfaa8047..9e70e8778c5a46c3821a42ce51ec2d78ab4cb758 100644 (file)
--- a/zmalloc.h
+++ b/zmalloc.h
@@ -33,7 +33,7 @@
 
 void *zmalloc(size_t size);
 void *zrealloc(void *ptr, size_t size);
 
 void *zmalloc(size_t size);
 void *zrealloc(void *ptr, size_t size);

-void *zfree(void *ptr);
+void zfree(void *ptr);

 char *zstrdup(const char *s);
 size_t zmalloc_used_memory(void);
 
 char *zstrdup(const char *s);
 size_t zmalloc_used_memory(void);