diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-06-19 16:06:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 16:06:11 +0200 |
| commit | 5f5e1199efa50310cb3477752b42630d522cd280 (patch) | |
| tree | 52088855aca4c08302de8157eb5388bbe1f2dd8b | |
| parent | 4848fbec8b95b8783f5becbdd72e461c9fa30716 (diff) | |
| parent | f31b0405f0023d8916efac3aa9b0c16d4db69fc4 (diff) | |
| download | redis-5f5e1199efa50310cb3477752b42630d522cd280.tar.gz | |
Merge pull request #5041 from oranagra/redis-rdb-check_rdbLoadMillisecondTime
fix redis-rdb-check to provide proper arguments to rdbLoadMillisecondTime
| -rw-r--r-- | src/rdb.h | 2 | ||||
| -rw-r--r-- | src/redis-check-rdb.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -129,6 +129,8 @@ int rdbLoadType(rio *rdb); int rdbSaveTime(rio *rdb, time_t t); time_t rdbLoadTime(rio *rdb); int rdbSaveLen(rio *rdb, uint64_t len); +int rdbSaveMillisecondTime(rio *rdb, long long t); +long long rdbLoadMillisecondTime(rio *rdb, int rdbver); uint64_t rdbLoadLen(rio *rdb, int *isencoded); int rdbLoadLenByRef(rio *rdb, int *isencoded, uint64_t *lenptr); int rdbSaveObjectType(rio *rdb, robj *o); diff --git a/src/redis-check-rdb.c b/src/redis-check-rdb.c index 6283e93d8..50854be0c 100644 --- a/src/redis-check-rdb.c +++ b/src/redis-check-rdb.c @@ -34,7 +34,6 @@ void createSharedObjects(void); void rdbLoadProgressCallback(rio *r, const void *buf, size_t len); -long long rdbLoadMillisecondTime(rio *rdb); int rdbCheckMode = 0; struct { @@ -224,7 +223,7 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) { /* EXPIRETIME_MS: milliseconds precision expire times introduced * with RDB v3. Like EXPIRETIME but no with more precision. */ rdbstate.doing = RDB_CHECK_DOING_READ_EXPIRE; - if ((expiretime = rdbLoadMillisecondTime(&rdb)) == -1) goto eoferr; + if ((expiretime = rdbLoadMillisecondTime(&rdb, rdbver)) == -1) goto eoferr; continue; /* Read next opcode. */ } else if (type == RDB_OPCODE_FREQ) { /* FREQ: LFU frequency. */ |