database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-34348: Fix casting related to plugins

Browse Source 
Partial commit of the greater MDEV-34348 scope.
MDEV-34348: MariaDB is violating clang-16 -Wcast-function-type-strict

Reviewed By:
============
Marko Mäkelä <marko.makela@mariadb.com>
This commit is contained in:
Brandon Nesterenko
2024-10-26 13:53:51 -06:00
parent 840fe316d4
commit 7a8eb26bda
9 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_audit.cc
View File

@ -18,8 +18,8 @@
#include "mysqld.h"
#include "sql_audit.h"
extern int initialize_audit_plugin(st_plugin_int *plugin);
extern int finalize_audit_plugin(st_plugin_int *plugin);
extern int initialize_audit_plugin(void *plugin);
extern int finalize_audit_plugin(void *plugin);
#ifndef EMBEDDED_LIBRARY
@ -262,8 +262,9 @@ void mysql_audit_finalize()
@retval TRUE There was an error.
*/
int initialize_audit_plugin(st_plugin_int *plugin)
int initialize_audit_plugin(void *plugin_)
{
st_plugin_int *plugin= static_cast<st_plugin_int *>(plugin_);
st_mysql_audit *data= (st_mysql_audit*) plugin->plugin->info;
if (!data->event_notify || !data->class_mask[0])
@ -346,8 +347,9 @@ static my_bool calc_class_mask(THD *thd, plugin_ref plugin, void *arg)
@retval FALSE OK
@retval TRUE There was an error.
*/
int finalize_audit_plugin(st_plugin_int *plugin)
int finalize_audit_plugin(void *plugin_)
{
st_plugin_int *plugin= static_cast<st_plugin_int *>(plugin_);
unsigned long event_class_mask[MYSQL_AUDIT_CLASS_MASK_SIZE];
if (plugin->plugin->deinit && plugin->plugin->deinit(NULL))
@ -458,13 +460,13 @@ void mysql_audit_finalize()
}
int initialize_audit_plugin(st_plugin_int *plugin)
int initialize_audit_plugin(void *plugin)
{
return 1;
}
int finalize_audit_plugin(st_plugin_int *plugin)
int finalize_audit_plugin(void *plugin)
{
return 0;
}