Commit 06be773c authored by Sergei Golubchik's avatar Sergei Golubchik

Revert revision sergii@pisem.net-20130123151853-xc6i3l11aqv0iykk

Rename back my_init_dynamic_array2() -> init_dynamic_array2()
It happens to be a part of the de facto API :(
parent 10740939
...@@ -782,8 +782,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache); ...@@ -782,8 +782,9 @@ extern my_bool real_open_cached_file(IO_CACHE *cache);
extern void close_cached_file(IO_CACHE *cache); extern void close_cached_file(IO_CACHE *cache);
File create_temp_file(char *to, const char *dir, const char *pfx, File create_temp_file(char *to, const char *dir, const char *pfx,
int mode, myf MyFlags); int mode, myf MyFlags);
#define my_init_dynamic_array(A,B,C,D,E) my_init_dynamic_array2(A,B,NULL,C,D,E) #define my_init_dynamic_array(A,B,C,D,E) init_dynamic_array2(A,B,NULL,C,D,E)
extern my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, #define my_init_dynamic_array2(A,B,C,D,E,F) init_dynamic_array2(A,B,C,D,E,F)
extern my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
void *init_buffer, uint init_alloc, void *init_buffer, uint init_alloc,
uint alloc_increment, myf my_flags); uint alloc_increment, myf my_flags);
extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void* element); extern my_bool insert_dynamic(DYNAMIC_ARRAY *array, const void* element);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Initiate dynamic array Initiate dynamic array
SYNOPSIS SYNOPSIS
my_init_dynamic_array2() init_dynamic_array2()
array Pointer to an array array Pointer to an array
element_size Size of element element_size Size of element
init_buffer Initial buffer pointer init_buffer Initial buffer pointer
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
my_flags Flags to my_malloc my_flags Flags to my_malloc
DESCRIPTION DESCRIPTION
my_init_dynamic_array2() initiates array and allocate space for init_dynamic_array() initiates array and allocate space for
init_alloc eilements. init_alloc eilements.
Array is usable even if space allocation failed, hence, the Array is usable even if space allocation failed, hence, the
function never returns TRUE. function never returns TRUE.
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
FALSE Ok FALSE Ok
*/ */
my_bool my_init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
void *init_buffer, uint init_alloc, void *init_buffer, uint init_alloc,
uint alloc_increment, myf my_flags) uint alloc_increment, myf my_flags)
{ {
DBUG_ENTER("my_init_dynamic_array2"); DBUG_ENTER("init_dynamic_array2");
if (!alloc_increment) if (!alloc_increment)
{ {
alloc_increment=MY_MAX((8192-MALLOC_OVERHEAD)/element_size,16); alloc_increment=MY_MAX((8192-MALLOC_OVERHEAD)/element_size,16);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment