1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warnings in guess_malloc_library

Browse Source
This commit is contained in:
Monty 2017-12-22 15:03:24 +02:00
parent d9e90292eb
commit 1d9fd4faec
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mysys/guess_malloc_library.c
View File

@ -21,8 +21,13 @@
#include "my_global.h"
#include <m_string.h>
typedef const char* (*tc_version_type)(int*, int*, const char**);
typedef int (*mallctl_type)(const char*, void*, size_t*, void*, size_t);
char *guess_malloc_library()
{
tc_version_type tc_version_func;
mallctl_type mallctl_func;
#ifndef HAVE_DLOPEN
return (char*) MALLOC_LIBRARY;
#else
@ -34,9 +39,7 @@ char *guess_malloc_library()
}
/* tcmalloc */
typedef const char* (*tc_version_type)(int*, int*, const char**);
tc_version_type tc_version_func =
(tc_version_type) dlsym(RTLD_DEFAULT, "tc_version");
tc_version_func= (tc_version_type) dlsym(RTLD_DEFAULT, "tc_version");
if (tc_version_func)
{
int major, minor;
@ -46,9 +49,7 @@ char *guess_malloc_library()
}
/* jemalloc */
typedef int (*mallctl_type)(const char*, void*, size_t*, void*, size_t);
mallctl_type mallctl_func =
(mallctl_type) dlsym(RTLD_DEFAULT, "mallctl");
mallctl_func= (mallctl_type) dlsym(RTLD_DEFAULT, "mallctl");
if (mallctl_func)
{
char *ver;