diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-05-24 13:24:36 +0300 |
| commit | fc3b3a0a864fd142f65bbd5ff611d2f09041a258 (patch) | |
| tree | 94027c861a0c3fd6ad62c4bee7ae5f7b1088f056 /mysys/array.c | |
| parent | 2ff938d21c596d1769076d2703b22120d2cf8336 (diff) | |
| parent | 088e2395f1833f16c2ea3f7405f604165b4aa2cc (diff) | |
| download | mariadb-git-fc3b3a0a864fd142f65bbd5ff611d2f09041a258.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
Diffstat (limited to 'mysys/array.c')
| -rw-r--r-- | mysys/array.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mysys/array.c b/mysys/array.c index 130a8f358de..73bf3bdf4b4 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -92,9 +92,9 @@ my_bool init_dynamic_array(DYNAMIC_ARRAY *array, uint element_size, FALSE Ok */ -my_bool insert_dynamic(DYNAMIC_ARRAY *array, gptr element) +my_bool insert_dynamic(DYNAMIC_ARRAY *array, uchar* element) { - gptr buffer; + uchar* buffer; if (array->elements == array->max_element) { /* Call only when nessesary */ if (!(buffer=alloc_dynamic(array))) @@ -127,7 +127,7 @@ my_bool insert_dynamic(DYNAMIC_ARRAY *array, gptr element) 0 Error */ -byte *alloc_dynamic(DYNAMIC_ARRAY *array) +uchar *alloc_dynamic(DYNAMIC_ARRAY *array) { if (array->elements == array->max_element) { @@ -171,7 +171,7 @@ byte *alloc_dynamic(DYNAMIC_ARRAY *array) 0 Array is empty */ -byte *pop_dynamic(DYNAMIC_ARRAY *array) +uchar *pop_dynamic(DYNAMIC_ARRAY *array) { if (array->elements) return array->buffer+(--array->elements * array->size_of_element); @@ -196,7 +196,7 @@ byte *pop_dynamic(DYNAMIC_ARRAY *array) FALSE Ok */ -my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) +my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx) { if (idx >= array->elements) { @@ -227,7 +227,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) array->buffer=new_ptr; array->max_element=size; } - bzero((gptr) (array->buffer+array->elements*array->size_of_element), + bzero((uchar*) (array->buffer+array->elements*array->size_of_element), (idx - array->elements)*array->size_of_element); array->elements=idx+1; } @@ -242,11 +242,11 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) SYNOPSIS get_dynamic() array - gptr Element to be returned. If idx > elements contain zeroes. + uchar* Element to be returned. If idx > elements contain zeroes. idx Index of element wanted. */ -void get_dynamic(DYNAMIC_ARRAY *array, gptr element, uint idx) +void get_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx) { if (idx >= array->elements) { @@ -341,7 +341,7 @@ void freeze_size(DYNAMIC_ARRAY *array) */ -int get_index_dynamic(DYNAMIC_ARRAY *array, gptr element) +int get_index_dynamic(DYNAMIC_ARRAY *array, uchar* element) { uint ret; if (array->buffer > element) |