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
5189db3d
Commit
5189db3d
authored
Jul 17, 2019
by
antirez
Browse files
RDB: modify rdbReportError() var name for clarity.
parent
48d91cf4
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
5189db3d
...
@@ -43,16 +43,16 @@
...
@@ -43,16 +43,16 @@
#include <sys/param.h>
#include <sys/param.h>
/* This macro is called when the internal RDB stracture is corrupt */
/* This macro is called when the internal RDB stracture is corrupt */
#define rdbExitReportCorruptRDB(...) rdbReport
Read
Error(
0
, __LINE__,__VA_ARGS__)
#define rdbExitReportCorruptRDB(...) rdbReportError(
1
, __LINE__,__VA_ARGS__)
/* This macro is called when RDB read failed (possibly a short read) */
/* This macro is called when RDB read failed (possibly a short read) */
#define rdbReportReadError(...) rdbReportError(
1
, __LINE__,__VA_ARGS__)
#define rdbReportReadError(...) rdbReportError(
0
, __LINE__,__VA_ARGS__)
char
*
rdbFileBeingLoaded
=
NULL
;
/* used for rdb checking on read error */
char
*
rdbFileBeingLoaded
=
NULL
;
/* used for rdb checking on read error */
extern
int
rdbCheckMode
;
extern
int
rdbCheckMode
;
void
rdbCheckError
(
const
char
*
fmt
,
...);
void
rdbCheckError
(
const
char
*
fmt
,
...);
void
rdbCheckSetError
(
const
char
*
fmt
,
...);
void
rdbCheckSetError
(
const
char
*
fmt
,
...);
void
rdbReportError
(
int
read
_error
,
int
linenum
,
char
*
reason
,
...)
{
void
rdbReportError
(
int
corruption
_error
,
int
linenum
,
char
*
reason
,
...)
{
va_list
ap
;
va_list
ap
;
char
msg
[
1024
];
char
msg
[
1024
];
int
len
;
int
len
;
...
@@ -65,7 +65,7 @@ void rdbReportError(int read_error, int linenum, char *reason, ...) {
...
@@ -65,7 +65,7 @@ void rdbReportError(int read_error, int linenum, char *reason, ...) {
va_end
(
ap
);
va_end
(
ap
);
if
(
!
rdbCheckMode
)
{
if
(
!
rdbCheckMode
)
{
if
(
rdbFileBeingLoaded
||
!
read
_error
)
{
if
(
rdbFileBeingLoaded
||
corruption
_error
)
{
serverLog
(
LL_WARNING
,
"%s"
,
msg
);
serverLog
(
LL_WARNING
,
"%s"
,
msg
);
char
*
argv
[
2
]
=
{
""
,
rdbFileBeingLoaded
};
char
*
argv
[
2
]
=
{
""
,
rdbFileBeingLoaded
};
redis_check_rdb_main
(
2
,
argv
,
NULL
);
redis_check_rdb_main
(
2
,
argv
,
NULL
);
...
...
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