Merge remote branch 'pietern/test-encoding-fix' into writeonexpire

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index fb051f8ebc6d07bdd58e5d5831ad0ede9703c83a..c211cfb5e9d4bc9d2c20d2187d01a3862a7094f8 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -752,10 +752,10 @@ void resetServerSaveParams();
 
 /* db.c -- Keyspace access API */
 int removeExpire(redisDb *db, robj *key);
+void propagateExpire(redisDb *db, robj *key);
 int expireIfNeeded(redisDb *db, robj *key);
-int deleteIfVolatile(redisDb *db, robj *key);
 time_t getExpire(redisDb *db, robj *key);
-int setExpire(redisDb *db, robj *key, time_t when);
+void setExpire(redisDb *db, robj *key, time_t when);
 robj *lookupKey(redisDb *db, robj *key);
 robj *lookupKeyRead(redisDb *db, robj *key);
 robj *lookupKeyWrite(redisDb *db, robj *key);