Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
10c12171
R
redis
项目概览
xindoo
/
redis
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
10c12171
编写于
11月 02, 2010
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removed a number of stupid compilation warnings on Linux
上级
92e28228
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
18 deletion
+21
-18
src/redis-check-dump.c
src/redis-check-dump.c
+2
-1
src/redis.c
src/redis.c
+1
-1
src/ziplist.c
src/ziplist.c
+16
-14
src/zipmap.c
src/zipmap.c
+2
-2
未找到文件。
src/redis-check-dump.c
浏览文件 @
10c12171
...
...
@@ -538,7 +538,8 @@ void printErrorStack(entry *e) {
/* display error stack */
for
(
i
=
0
;
i
<
errors
.
level
;
i
++
)
{
printf
(
"0x%08lx - %s
\n
"
,
errors
.
offset
[
i
],
errors
.
error
[
i
]);
printf
(
"0x%08lx - %s
\n
"
,
(
unsigned
long
)
errors
.
offset
[
i
],
errors
.
error
[
i
]);
}
}
...
...
src/redis.c
浏览文件 @
10c12171
...
...
@@ -1250,7 +1250,7 @@ void freeMemoryIfNeeded(void) {
if
(
tryFreeOneObjectFromFreelist
()
==
REDIS_OK
)
continue
;
for
(
j
=
0
;
j
<
server
.
dbnum
;
j
++
)
{
long
bestval
;
long
bestval
=
0
;
/* just to prevent warning */
sds
bestkey
=
NULL
;
struct
dictEntry
*
de
;
redisDb
*
db
=
server
.
db
+
j
;
...
...
src/ziplist.c
浏览文件 @
10c12171
...
...
@@ -754,9 +754,9 @@ void ziplistRepr(unsigned char *zl) {
"pls: %2u, "
"payload %5u"
"} "
,
(
long
unsigned
int
)
p
,
(
long
unsigned
)
p
,
index
,
p
-
zl
,
(
unsigned
long
)
(
p
-
zl
)
,
entry
.
headersize
+
entry
.
len
,
entry
.
headersize
,
entry
.
prevrawlen
,
...
...
@@ -765,10 +765,11 @@ void ziplistRepr(unsigned char *zl) {
p
+=
entry
.
headersize
;
if
(
ZIP_IS_STR
(
entry
.
encoding
))
{
if
(
entry
.
len
>
40
)
{
fwrite
(
p
,
40
,
1
,
stdout
);
if
(
fwrite
(
p
,
40
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
printf
(
"..."
);
}
else
{
fwrite
(
p
,
entry
.
len
,
1
,
stdout
);
if
(
entry
.
len
&&
fwrite
(
p
,
entry
.
len
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
}
else
{
printf
(
"%lld"
,
(
long
long
)
zipLoadInteger
(
p
,
entry
.
encoding
));
...
...
@@ -857,7 +858,7 @@ void pop(unsigned char *zl, int where) {
printf
(
"Pop tail: "
);
if
(
vstr
)
fwrite
(
vstr
,
vlen
,
1
,
stdout
);
if
(
vlen
&&
fwrite
(
vstr
,
vlen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
else
printf
(
"%lld"
,
vlong
);
...
...
@@ -932,7 +933,7 @@ int main(int argc, char **argv) {
return
1
;
}
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
printf
(
"
\n
"
);
}
else
{
printf
(
"%lld
\n
"
,
value
);
...
...
@@ -962,7 +963,7 @@ int main(int argc, char **argv) {
return
1
;
}
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
printf
(
"
\n
"
);
}
else
{
printf
(
"%lld
\n
"
,
value
);
...
...
@@ -979,7 +980,7 @@ int main(int argc, char **argv) {
return
1
;
}
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
printf
(
"
\n
"
);
}
else
{
printf
(
"%lld
\n
"
,
value
);
...
...
@@ -1007,7 +1008,7 @@ int main(int argc, char **argv) {
while
(
ziplistGet
(
p
,
&
entry
,
&
elen
,
&
value
))
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
@@ -1024,7 +1025,7 @@ int main(int argc, char **argv) {
while
(
ziplistGet
(
p
,
&
entry
,
&
elen
,
&
value
))
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
@@ -1041,7 +1042,7 @@ int main(int argc, char **argv) {
while
(
ziplistGet
(
p
,
&
entry
,
&
elen
,
&
value
))
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
@@ -1070,7 +1071,7 @@ int main(int argc, char **argv) {
while
(
ziplistGet
(
p
,
&
entry
,
&
elen
,
&
value
))
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
@@ -1087,7 +1088,7 @@ int main(int argc, char **argv) {
while
(
ziplistGet
(
p
,
&
entry
,
&
elen
,
&
value
))
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
@@ -1144,7 +1145,8 @@ int main(int argc, char **argv) {
}
else
{
printf
(
"Entry: "
);
if
(
entry
)
{
fwrite
(
entry
,
elen
,
1
,
stdout
);
if
(
elen
&&
fwrite
(
entry
,
elen
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
}
else
{
printf
(
"%lld"
,
value
);
}
...
...
src/zipmap.c
浏览文件 @
10c12171
...
...
@@ -374,14 +374,14 @@ void zipmapRepr(unsigned char *p) {
l
=
zipmapDecodeLength
(
p
);
printf
(
"{key %u}"
,
l
);
p
+=
zipmapEncodeLength
(
NULL
,
l
);
fwrite
(
p
,
l
,
1
,
stdout
);
if
(
l
!=
0
&&
fwrite
(
p
,
l
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
p
+=
l
;
l
=
zipmapDecodeLength
(
p
);
printf
(
"{value %u}"
,
l
);
p
+=
zipmapEncodeLength
(
NULL
,
l
);
e
=
*
p
++
;
fwrite
(
p
,
l
,
1
,
stdout
);
if
(
l
!=
0
&&
fwrite
(
p
,
l
,
1
,
stdout
)
==
0
)
perror
(
"fwrite"
);
p
+=
l
+
e
;
if
(
e
)
{
printf
(
"["
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录