Commit 29e5a66b authored by unknown's avatar unknown

Added casts to avoid compiler warnings and fixed a wrong type.


mysys/array.c:
  Added casts to avoid compiler warnings.
mysys/hash.c:
  Added casts to avoid compiler warnings.
sql/sql_plugin.cc:
  Fixed wrong type.
parent 64a82941
...@@ -63,7 +63,7 @@ my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size, ...@@ -63,7 +63,7 @@ my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
array->size_of_element=element_size; array->size_of_element=element_size;
if ((array->buffer= init_buffer)) if ((array->buffer= init_buffer))
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
if (!(array->buffer=(char*) my_malloc_ci(element_size*init_alloc,MYF(MY_WME)))) if (!(array->buffer=(uchar*) my_malloc_ci(element_size*init_alloc,MYF(MY_WME))))
{ {
array->max_element=0; array->max_element=0;
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
...@@ -132,7 +132,7 @@ uchar *alloc_dynamic(DYNAMIC_ARRAY *array) ...@@ -132,7 +132,7 @@ uchar *alloc_dynamic(DYNAMIC_ARRAY *array)
if (array->elements == array->max_element) if (array->elements == array->max_element)
{ {
char *new_ptr; char *new_ptr;
if (array->buffer == (char *)(array + 1)) if (array->buffer == (uchar *)(array + 1))
{ {
/* /*
In this senerio, the buffer is statically preallocated, In this senerio, the buffer is statically preallocated,
...@@ -152,7 +152,7 @@ uchar *alloc_dynamic(DYNAMIC_ARRAY *array) ...@@ -152,7 +152,7 @@ uchar *alloc_dynamic(DYNAMIC_ARRAY *array)
array->size_of_element, array->size_of_element,
MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
return 0; return 0;
array->buffer=new_ptr; array->buffer= (uchar*) new_ptr;
array->max_element+=array->alloc_increment; array->max_element+=array->alloc_increment;
} }
return array->buffer+(array->elements++ * array->size_of_element); return array->buffer+(array->elements++ * array->size_of_element);
...@@ -206,7 +206,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx) ...@@ -206,7 +206,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx)
char *new_ptr; char *new_ptr;
size=(idx+array->alloc_increment)/array->alloc_increment; size=(idx+array->alloc_increment)/array->alloc_increment;
size*= array->alloc_increment; size*= array->alloc_increment;
if (array->buffer == (char *)(array + 1)) if (array->buffer == (uchar *)(array + 1))
{ {
/* /*
In this senerio, the buffer is statically preallocated, In this senerio, the buffer is statically preallocated,
...@@ -224,7 +224,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx) ...@@ -224,7 +224,7 @@ my_bool set_dynamic(DYNAMIC_ARRAY *array, uchar* element, uint idx)
array->size_of_element, array->size_of_element,
MYF(MY_WME | MY_ALLOW_ZERO_PTR)))) MYF(MY_WME | MY_ALLOW_ZERO_PTR))))
return TRUE; return TRUE;
array->buffer=new_ptr; array->buffer= (uchar*) new_ptr;
array->max_element=size; array->max_element=size;
} }
bzero((uchar*) (array->buffer+array->elements*array->size_of_element), bzero((uchar*) (array->buffer+array->elements*array->size_of_element),
...@@ -273,7 +273,7 @@ void delete_dynamic(DYNAMIC_ARRAY *array) ...@@ -273,7 +273,7 @@ void delete_dynamic(DYNAMIC_ARRAY *array)
/* /*
Just mark as empty if we are using a static buffer Just mark as empty if we are using a static buffer
*/ */
if (array->buffer == (char *)(array + 1)) if (array->buffer == (uchar *)(array + 1))
array->elements= 0; array->elements= 0;
else else
if (array->buffer) if (array->buffer)
...@@ -295,7 +295,7 @@ void delete_dynamic(DYNAMIC_ARRAY *array) ...@@ -295,7 +295,7 @@ void delete_dynamic(DYNAMIC_ARRAY *array)
void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx) void delete_dynamic_element(DYNAMIC_ARRAY *array, uint idx)
{ {
char *ptr=array->buffer+array->size_of_element*idx; char *ptr= (char*) array->buffer+array->size_of_element*idx;
array->elements--; array->elements--;
memmove(ptr,ptr+array->size_of_element, memmove(ptr,ptr+array->size_of_element,
(array->elements-idx)*array->size_of_element); (array->elements-idx)*array->size_of_element);
...@@ -318,12 +318,12 @@ void freeze_size(DYNAMIC_ARRAY *array) ...@@ -318,12 +318,12 @@ void freeze_size(DYNAMIC_ARRAY *array)
/* /*
Do nothing if we are using a static buffer Do nothing if we are using a static buffer
*/ */
if (array->buffer == (char *)(array + 1)) if (array->buffer == (uchar *)(array + 1))
return; return;
if (array->buffer && array->max_element != elements) if (array->buffer && array->max_element != elements)
{ {
array->buffer=(char*) my_realloc(array->buffer, array->buffer=(uchar*) my_realloc(array->buffer,
elements*array->size_of_element, elements*array->size_of_element,
MYF(MY_WME)); MYF(MY_WME));
array->max_element=elements; array->max_element=elements;
......
...@@ -308,7 +308,8 @@ static int hashcmp(const HASH *hash, HASH_LINK *pos, const uchar *key, ...@@ -308,7 +308,8 @@ static int hashcmp(const HASH *hash, HASH_LINK *pos, const uchar *key,
my_bool my_hash_insert(HASH *info,const uchar *record) my_bool my_hash_insert(HASH *info,const uchar *record)
{ {
int flag; int flag;
uint halfbuff,hash_nr,first_index,idx; size_t idx;
uint halfbuff,hash_nr,first_index;
uchar *ptr_to_rec,*ptr_to_rec2; uchar *ptr_to_rec,*ptr_to_rec2;
HASH_LINK *data,*empty,*gpos,*gpos2,*pos; HASH_LINK *data,*empty,*gpos,*gpos2,*pos;
...@@ -535,7 +536,8 @@ exit: ...@@ -535,7 +536,8 @@ exit:
my_bool hash_update(HASH *hash, uchar *record, uchar *old_key, my_bool hash_update(HASH *hash, uchar *record, uchar *old_key,
size_t old_key_length) size_t old_key_length)
{ {
uint idx,new_index,new_pos_index,blength,records,empty; uint new_index,new_pos_index,blength,records,empty;
size_t idx;
HASH_LINK org_link,*data,*previous,*pos; HASH_LINK org_link,*data,*previous,*pos;
DBUG_ENTER("hash_update"); DBUG_ENTER("hash_update");
...@@ -546,7 +548,7 @@ my_bool hash_update(HASH *hash, uchar *record, uchar *old_key, ...@@ -546,7 +548,7 @@ my_bool hash_update(HASH *hash, uchar *record, uchar *old_key,
if ((found= hash_first(hash, new_key, idx, &state))) if ((found= hash_first(hash, new_key, idx, &state)))
do do
{ {
if (found != record) if (found != (char*) record)
DBUG_RETURN(1); /* Duplicate entry */ DBUG_RETURN(1); /* Duplicate entry */
} }
while ((found= hash_next(hash, new_key, idx, &state))); while ((found= hash_next(hash, new_key, idx, &state)));
......
...@@ -1056,7 +1056,7 @@ static uchar *get_hash_key(const uchar *buff, size_t *length, ...@@ -1056,7 +1056,7 @@ static uchar *get_hash_key(const uchar *buff, size_t *length,
} }
static uchar *get_bookmark_hash_key(const uchar *buff, uint *length, static uchar *get_bookmark_hash_key(const uchar *buff, size_t *length,
my_bool not_used __attribute__((unused))) my_bool not_used __attribute__((unused)))
{ {
struct st_bookmark *var= (st_bookmark *)buff; struct st_bookmark *var= (st_bookmark *)buff;
......
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