database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-34348: Consolidate cmp function declarations

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

79
mysys/ptr_cmp.c
View File

@@ -44,40 +44,43 @@
#include <string.h>
static int native_compare(size_t *length, unsigned char **a, unsigned char **b)
static int native_compare(void *length_, const void *a_, const void *b_)
{
size_t *length= length_;
const unsigned char *const *a= a_;
const unsigned char *const *b= b_;
return memcmp(*a, *b, *length);
}
qsort2_cmp get_ptr_compare (size_t size __attribute__((unused)))
qsort_cmp2 get_ptr_compare (size_t size __attribute__((unused)))
{
return (qsort2_cmp) native_compare;
return native_compare;
}
#else /* USE_NATIVE_MEMCMP */
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_0(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_1(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_2(size_t *compare_length, uchar **a, uchar **b);
static int ptr_compare_3(size_t *compare_length, uchar **a, uchar **b);
static int degenerate_compare_func(size_t *compare_length, uchar **a, uchar **b)
static int ptr_compare(void *compare_length, const void *a, const void *b);
static int ptr_compare_0(void *compare_length, const void *a, const void *b);
static int ptr_compare_1(void *compare_length, const void *a, const void *b);
static int ptr_compare_2(void *compare_length, const void *a, const void *b);
static int ptr_compare_3(void *compare_length, const void *a, const void *b);
static int degenerate_compare_func(void *compare_length, const void *a, const void *b)
{
DBUG_ASSERT(*compare_length == 0);
DBUG_ASSERT(*((size_t *) compare_length) == 0);
return 0;
}
qsort2_cmp get_ptr_compare (size_t size)
qsort_cmp2 get_ptr_compare (size_t size)
{
if (size == 0)
return (qsort2_cmp) degenerate_compare_func;
return degenerate_compare_func;
if (size < 4)
return (qsort2_cmp) ptr_compare;
return ptr_compare;
switch (size & 3) {
case 0: return (qsort2_cmp) ptr_compare_0;
case 1: return (qsort2_cmp) ptr_compare_1;
case 2: return (qsort2_cmp) ptr_compare_2;
case 3: return (qsort2_cmp) ptr_compare_3;
case 0: return ptr_compare_0;
case 1: return ptr_compare_1;
case 2: return ptr_compare_2;
case 3: return ptr_compare_3;
}
return 0; /* Impossible */
}
@@ -88,13 +91,13 @@ qsort2_cmp get_ptr_compare (size_t size)
#define cmp(N) if (first[N] != last[N]) return (int) first[N] - (int) last[N]
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
static int ptr_compare(void *compare_length, const void *a, const void *b)
{
size_t length= *compare_length;
uchar *first,*last;
size_t length= *((size_t *) compare_length);
const uchar *first= *((const uchar *const *) a);
const uchar *last= *((const uchar *const *) b);
DBUG_ASSERT(length > 0);
first= *a; last= *b;
while (--length)
{
if (*first++ != *last++)
@@ -104,12 +107,11 @@ static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
}
static int ptr_compare_0(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_0(void *compare_length, const void *a, const void *b)
{
size_t length= *compare_length;
uchar *first,*last;
first= *a; last= *b;
size_t length= *((size_t *) compare_length);
const uchar *first= *((const uchar *const *) a);
const uchar *last= *((const uchar *const *) b);
loop:
cmp(0);
cmp(1);
@@ -125,12 +127,13 @@ static int ptr_compare_0(size_t *compare_length,uchar **a, uchar **b)
}
static int ptr_compare_1(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_1(void *compare_length, const void *a, const void *b)
{
size_t length= *compare_length-1;
uchar *first,*last;
first= *a+1; last= *b+1;
size_t length= *((size_t *) compare_length) - 1;
const uchar *first= *((const uchar *const *) a) + 1;
const uchar *last= *((const uchar *const *) b) + 1;
cmp(-1);
loop:
cmp(0);
@@ -146,12 +149,12 @@ static int ptr_compare_1(size_t *compare_length,uchar **a, uchar **b)
return (0);
}
static int ptr_compare_2(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_2(void *compare_length, const void *a, const void *b)
{
size_t length= *compare_length-2;
uchar *first,*last;
size_t length= *((size_t *) compare_length) - 2;
const uchar *first= *((const uchar *const *) a) + 2;
const uchar *last= *((const uchar *const *) b) + 2;
first= *a +2 ; last= *b +2;
cmp(-2);
cmp(-1);
loop:
@@ -168,12 +171,12 @@ static int ptr_compare_2(size_t *compare_length,uchar **a, uchar **b)
return (0);
}
static int ptr_compare_3(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_3(void *compare_length, const void *a, const void *b)
{
size_t length= *compare_length-3;
uchar *first,*last;
size_t length= *((size_t *) compare_length) - 3;
const uchar *first= *((const uchar *const *) a) + 3;
const uchar *last= *((const uchar *const *) b) + 3;
first= *a +3 ; last= *b +3;
cmp(-3);
cmp(-2);
cmp(-1);