From 401ff6994d842a4072b7b155e5a958e178e6497a Mon Sep 17 00:00:00 2001 From: Eric Herman Date: Fri, 3 Sep 2021 06:38:54 +0200 Subject: 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. --- strings/json_normalize.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'strings/json_normalize.c') diff --git a/strings/json_normalize.c b/strings/json_normalize.c index c83713056d1..0b7f172dae6 100644 --- a/strings/json_normalize.c +++ b/strings/json_normalize.c @@ -264,9 +264,9 @@ json_norm_array_append_value(struct json_norm_array *arr, int json_norm_init_dynamic_array(size_t element_size, void *where) { - const uint init_alloc= 20; - const uint alloc_increment= 20; - return my_init_dynamic_array(PSI_JSON, where, (uint)element_size, + const size_t init_alloc= 20; + const size_t alloc_increment= 20; + return my_init_dynamic_array(PSI_JSON, where, element_size, init_alloc, alloc_increment, JSON_MALLOC_FLAGS); } -- cgit v1.2.1