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
f85202c3
Commit
f85202c3
authored
Aug 31, 2010
by
Pieter Noordhuis
Browse files
Fix compilation errors and add warning for 32-bit platforms
parent
7b30cc3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis-check-dump.c
View file @
f85202c3
...
@@ -65,8 +65,8 @@
...
@@ -65,8 +65,8 @@
/* data type to hold offset in file and size */
/* data type to hold offset in file and size */
typedef
struct
{
typedef
struct
{
void
*
data
;
void
*
data
;
uint64
_t
size
;
size
_t
size
;
uint64
_t
offset
;
size
_t
offset
;
}
pos
;
}
pos
;
static
unsigned
char
level
=
0
;
static
unsigned
char
level
=
0
;
...
@@ -77,8 +77,8 @@ static pos positions[16];
...
@@ -77,8 +77,8 @@ static pos positions[16];
/* Hold a stack of errors */
/* Hold a stack of errors */
typedef
struct
{
typedef
struct
{
char
error
[
16
][
1024
];
char
error
[
16
][
1024
];
uint64
_t
offset
[
16
];
size
_t
offset
[
16
];
uint32
_t
level
;
size
_t
level
;
}
errors_t
;
}
errors_t
;
static
errors_t
errors
;
static
errors_t
errors
;
...
@@ -112,7 +112,7 @@ int readBytes(void *target, long num) {
...
@@ -112,7 +112,7 @@ int readBytes(void *target, long num) {
if
(
p
.
offset
+
num
>
p
.
size
)
{
if
(
p
.
offset
+
num
>
p
.
size
)
{
return
0
;
return
0
;
}
else
{
}
else
{
memcpy
(
target
,
(
void
*
)((
unsigned
long
)
p
.
data
+
p
.
offset
),
num
);
memcpy
(
target
,
(
void
*
)((
size_t
)
p
.
data
+
p
.
offset
),
num
);
if
(
!
peek
)
positions
[
level
].
offset
+=
num
;
if
(
!
peek
)
positions
[
level
].
offset
+=
num
;
}
}
return
1
;
return
1
;
...
@@ -536,7 +536,7 @@ void printErrorStack(entry *e) {
...
@@ -536,7 +536,7 @@ void printErrorStack(entry *e) {
/* display error stack */
/* display error stack */
for
(
i
=
0
;
i
<
errors
.
level
;
i
++
)
{
for
(
i
=
0
;
i
<
errors
.
level
;
i
++
)
{
printf
(
"0x%08l
l
x - %s
\n
"
,
errors
.
offset
[
i
],
errors
.
error
[
i
]);
printf
(
"0x%08lx - %s
\n
"
,
errors
.
offset
[
i
],
errors
.
error
[
i
]);
}
}
}
}
...
@@ -622,7 +622,7 @@ int main(int argc, char **argv) {
...
@@ -622,7 +622,7 @@ int main(int argc, char **argv) {
}
}
int
fd
;
int
fd
;
size
_t
size
;
off
_t
size
;
struct
stat
stat
;
struct
stat
stat
;
void
*
data
;
void
*
data
;
...
@@ -636,6 +636,10 @@ int main(int argc, char **argv) {
...
@@ -636,6 +636,10 @@ int main(int argc, char **argv) {
size
=
stat
.
st_size
;
size
=
stat
.
st_size
;
}
}
if
(
sizeof
(
size_t
)
==
sizeof
(
int32_t
)
&&
size
>=
INT_MAX
)
{
ERROR
(
"Cannot check dump files >2GB on a 32-bit platform
\n
"
);
}
data
=
mmap
(
NULL
,
size
,
PROT_READ
,
MAP_SHARED
,
fd
,
0
);
data
=
mmap
(
NULL
,
size
,
PROT_READ
,
MAP_SHARED
,
fd
,
0
);
if
(
data
==
MAP_FAILED
)
{
if
(
data
==
MAP_FAILED
)
{
ERROR
(
"Cannot mmap: %s
\n
"
,
argv
[
1
]);
ERROR
(
"Cannot mmap: %s
\n
"
,
argv
[
1
]);
...
...
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