diff options
| author | antirez <antirez@gmail.com> | 2015-07-26 15:29:53 +0200 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2015-07-26 15:29:53 +0200 |
| commit | 2d9e3eb107b6b6289d5e3a51a32b3a018c96103c (patch) | |
| tree | 379b4a8c2498a9be22d2f2b9ea3970669ebe42e5 /src/server.h | |
| parent | 14ff572482cfe02c5ac61a1816cb8099d458e499 (diff) | |
| download | redis-2d9e3eb107b6b6289d5e3a51a32b3a018c96103c.tar.gz | |
RDMF: redisAssert -> serverAssert.
Diffstat (limited to 'src/server.h')
| -rw-r--r-- | src/server.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server.h b/src/server.h index 7bed5be57..6677d8419 100644 --- a/src/server.h +++ b/src/server.h @@ -412,8 +412,8 @@ typedef long long mstime_t; /* millisecond time type. */ #define run_with_period(_ms_) if ((_ms_ <= 1000/server.hz) || !(server.cronloops%((_ms_)/(1000/server.hz)))) /* We can print the stacktrace, so our assert is defined this way: */ -#define redisAssertWithInfo(_c,_o,_e) ((_e)?(void)0 : (_redisAssertWithInfo(_c,_o,#_e,__FILE__,__LINE__),_exit(1))) -#define redisAssert(_e) ((_e)?(void)0 : (_redisAssert(#_e,__FILE__,__LINE__),_exit(1))) +#define serverAssertWithInfo(_c,_o,_e) ((_e)?(void)0 : (_serverAssertWithInfo(_c,_o,#_e,__FILE__,__LINE__),_exit(1))) +#define serverAssert(_e) ((_e)?(void)0 : (_serverAssert(#_e,__FILE__,__LINE__),_exit(1))) #define redisPanic(_e) _redisPanic(#_e,__FILE__,__LINE__),_exit(1) /*----------------------------------------------------------------------------- @@ -1581,8 +1581,8 @@ void *realloc(void *ptr, size_t size) __attribute__ ((deprecated)); #endif /* Debugging stuff */ -void _redisAssertWithInfo(client *c, robj *o, char *estr, char *file, int line); -void _redisAssert(char *estr, char *file, int line); +void _serverAssertWithInfo(client *c, robj *o, char *estr, char *file, int line); +void _serverAssert(char *estr, char *file, int line); void _redisPanic(char *msg, char *file, int line); void bugReportStart(void); void serverLogObjectDebugInfo(robj *o); |