Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
65cc7665
Commit
65cc7665
authored
Jun 05, 2010
by
antirez
Browse files
Merge branch 'lists' of
git://github.com/pietern/redis
parents
6b0253fa
cd627d4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
65cc7665
...
@@ -4191,7 +4191,6 @@ static robj *rdbLoadObject(int type, FILE *fp) {
...
@@ -4191,7 +4191,6 @@ static robj *rdbLoadObject(int type, FILE *fp) {
}
else
{
}
else
{
ele
=
tryObjectEncoding
(
ele
);
ele
=
tryObjectEncoding
(
ele
);
listAddNodeTail
(
o
->
ptr
,
ele
);
listAddNodeTail
(
o
->
ptr
,
ele
);
incrRefCount
(
ele
);
}
}
}
}
}
else
if
(
type
==
REDIS_SET
)
{
}
else
if
(
type
==
REDIS_SET
)
{
...
@@ -5128,6 +5127,7 @@ static void listTypeConvert(robj *subject, int enc) {
...
@@ -5128,6 +5127,7 @@ static void listTypeConvert(robj *subject, int enc) {
if
(
enc
==
REDIS_ENCODING_LIST
)
{
if
(
enc
==
REDIS_ENCODING_LIST
)
{
list
*
l
=
listCreate
();
list
*
l
=
listCreate
();
listSetFreeMethod
(
l
,
decrRefCount
);
/* listTypeGet returns a robj with incremented refcount */
/* listTypeGet returns a robj with incremented refcount */
li
=
listTypeInitIterator
(
subject
,
0
,
REDIS_TAIL
);
li
=
listTypeInitIterator
(
subject
,
0
,
REDIS_TAIL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment