mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed compiler warnings in guess_malloc_library

Browse source
This commit is contained in:
Monty 2017-12-22 15:03:24 +02:00 committed by Marko Mäkelä
parent 39f236a2f5
commit abbce9ed56
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

@ -20,8 +20,13 @@
#include <stddef.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
@ -33,9 +38,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;
@ -45,9 +48,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;