gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix make warnings in debug.c MacOS (#7805)

Browse Source 
Co-authored-by: Oran Agra <oran@redislabs.com>
(cherry picked from commit 6d46a8e2163750f707f9d36889d5fdf514132a69)
This commit is contained in:
Daniel Dai 2020-09-20 05:06:17 -04:00 committed by Oran Agra
parent 57e1dbff57
commit 064992af62
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/debug.c
View File

@ -1510,7 +1510,7 @@ int memtest_test_linux_anonymous_maps(void) {
closeDirectLogFiledes(fd); closeDirectLogFiledes(fd);
return errors; return errors;
} }
#endif #endif /* HAVE_PROC_MAPS */
static void killMainThread(void) { static void killMainThread(void) {
int err; int err;
@ -1527,7 +1527,7 @@ static void killMainThread(void) {
* should be used only when it's critical to stop the threads for some reason. * should be used only when it's critical to stop the threads for some reason.
* Currently Redis does this only on crash (for instance on SIGSEGV) in order * Currently Redis does this only on crash (for instance on SIGSEGV) in order
* to perform a fast memory check without other threads messing with memory. */ * to perform a fast memory check without other threads messing with memory. */
static void killThreads(void) { void killThreads(void) {
killMainThread(); killMainThread();
bioKillThreads(); bioKillThreads();
killIOThreads(); killIOThreads();

1
src/server.h
View File

@ -2467,6 +2467,7 @@ void mixDigest(unsigned char *digest, void *ptr, size_t len);
void xorDigest(unsigned char *digest, void *ptr, size_t len); void xorDigest(unsigned char *digest, void *ptr, size_t len);
int populateCommandTableParseFlags(struct redisCommand *c, char *strflags); int populateCommandTableParseFlags(struct redisCommand *c, char *strflags);
void killIOThreads(void); void killIOThreads(void);
void killThreads(void);
/* TLS stuff */ /* TLS stuff */
void tlsInit(void); void tlsInit(void);