mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-26221: DYNAMIC_ARRAY use size_t for sizes
https://jira.mariadb.org/browse/MDEV-26221 my_sys DYNAMIC_ARRAY and DYNAMIC_STRING inconsistancy The DYNAMIC_STRING uses size_t for sizes, but DYNAMIC_ARRAY used uint. This patch adjusts DYNAMIC_ARRAY to use size_t like DYNAMIC_STRING. As the MY_DIR member number_of_files is copied from a DYNAMIC_ARRAY, this is changed to be size_t. As MY_TMPDIR members 'cur' and 'max' are copied from a DYNAMIC_ARRAY, these are also changed to be size_t. The lists of plugins and stored procedures use DYNAMIC_ARRAY, but their APIs assume a size of 'uint'; these are unchanged.
This commit is contained in:
committed by
Vicențiu-Marian Ciorbaru
parent
9ab0d07e10
commit
401ff6994d
@@ -440,7 +440,7 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
|
||||
{
|
||||
struct languages *tmp_lang, *next_language;
|
||||
struct errors *tmp_error, *next_error;
|
||||
uint count, i;
|
||||
size_t count, i;
|
||||
|
||||
if (default_language_changed)
|
||||
my_free((void*) default_language);
|
||||
@@ -724,7 +724,7 @@ static struct message *find_message(struct errors *err, const char *lang,
|
||||
my_bool no_default)
|
||||
{
|
||||
struct message *tmp, *return_val= 0;
|
||||
uint i, count;
|
||||
size_t i, count;
|
||||
DBUG_ENTER("find_message");
|
||||
|
||||
count= (err->msg).elements;
|
||||
|
Reference in New Issue
Block a user