1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

MDEV-34348: Consolidate cmp function declarations

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

The functions queue_compare, qsort2_cmp, and qsort_cmp2
all had similar interfaces, and were used interchangable
and unsafely cast to one another.

This patch consolidates the functions all into the
qsort_cmp2 interface.

Reviewed By:
============
Marko Mäkelä <marko.makela@mariadb.com>
This commit is contained in:
Brandon Nesterenko
2024-10-26 08:17:03 -06:00
parent 3997d28f48
commit dbfee9fc2b
83 changed files with 678 additions and 524 deletions

View File

@ -1108,10 +1108,11 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds,
***************************************************************************/
extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b)
extern "C" int refpos_order_cmp(void *arg, const void *a, const void *b)
{
handler *file= (handler*)arg;
return file->cmp_ref((const uchar*)a, (const uchar*)b);
auto file= static_cast<handler *>(arg);
return file->cmp_ref(static_cast<const uchar *>(a),
static_cast<const uchar *>(b));
}
/*