summaryrefslogtreecommitdiff
path: root/storage/maria/ma_search.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2009-01-09 06:23:25 +0200
committerMichael Widenius <monty@mysql.com>2009-01-09 06:23:25 +0200
commit7eda7f1337e633d473e432e9c74b3d2383b2f938 (patch)
tree70470ac755485cb1e7ed003c1828d7c213ebb88d /storage/maria/ma_search.c
parentd6bdf03375977d89bf66c64b5ce72b67ec35c36d (diff)
downloadmariadb-git-7eda7f1337e633d473e432e9c74b3d2383b2f938.tar.gz
Code cleanup:
- Removed not needed casts - Indentation fixes - Changed some buffer variables to uchar, to be able to remove casts storage/maria/ma_bitmap.c: Removed not needed casts storage/maria/ma_blockrec.c: Removed not needed casts storage/maria/ma_check.c: Removed not needed casts. Changed type of buffers to be able to remove casts storage/maria/ma_create.c: Removed not needed casts storage/maria/ma_delete.c: Removed not needed casts storage/maria/ma_dynrec.c: Removed not needed casts storage/maria/ma_extra.c: Removed not needed casts storage/maria/ma_ft_boolean_search.c: Removed not needed casts storage/maria/ma_ft_nlq_search.c: Removed not needed casts storage/maria/ma_ft_parser.c: Removed not needed casts storage/maria/ma_loghandler.c: Removed not needed casts storage/maria/ma_open.c: Removed not needed casts storage/maria/ma_packrec.c: Removed not needed casts storage/maria/ma_pagecache.c: Removed not needed casts storage/maria/ma_preload.c: Removed not needed casts Removed not needed initialization storage/maria/ma_rnext_same.c: Removed not needed casts storage/maria/ma_rt_index.c: Removed not needed casts storage/maria/ma_search.c: Removed not needed casts storage/maria/ma_sort.c: Removed not needed casts Removed not needed if Fixed indentation storage/maria/ma_statrec.c: Removed not needed casts storage/maria/ma_test2.c: Removed not needed casts storage/maria/ma_write.c: Removed not needed casts Indentation fixes storage/maria/maria_chk.c: Removed not needed casts storage/maria/maria_pack.c: Removed not needed casts
Diffstat (limited to 'storage/maria/ma_search.c')
-rw-r--r--storage/maria/ma_search.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/maria/ma_search.c b/storage/maria/ma_search.c
index e34bca4aa57..4d36232d695 100644
--- a/storage/maria/ma_search.c
+++ b/storage/maria/ma_search.c
@@ -322,7 +322,7 @@ int _ma_seq_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
page= ma_page->buff;
end= page + ma_page->size;
page+= share->keypage_header + nod_flag;
- *ret_pos= (uchar*) page;
+ *ret_pos= page;
t_buff[0]=0; /* Avoid bugs */
tmp_key.data= t_buff;
@@ -438,7 +438,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
uint packed= *page & 128;
uint key_flag;
- vseg= (uchar*) page;
+ vseg= page;
if (keyinfo->seg->length >= 127)
{
suffix_len=mi_uint2korr(vseg) & 32767;
@@ -509,7 +509,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
from+= transid_packed_length(from);
key_flag= SEARCH_PAGE_KEY_HAS_TRANSID;
}
- page= (uchar*) from+nod_flag;
+ page= from + nod_flag;
length= (uint) (from-vseg);
}
@@ -651,7 +651,7 @@ int _ma_prefix_search(const MARIA_KEY *key, const MARIA_PAGE *ma_page,
saved_length=length;
}
if (saved_length)
- memcpy(saved_to, (uchar*) saved_from, saved_length);
+ memcpy(saved_to, saved_from, saved_length);
*last_key= page == end;
@@ -1092,7 +1092,7 @@ uint _ma_get_pack_key(MARIA_KEY *int_key, uint page_flag,
else
length=keyseg->length;
}
- memcpy((uchar*) key,(uchar*) page,(size_t) length);
+ memcpy(key, page,(size_t) length);
key+=length;
page+=length;
}
@@ -1280,7 +1280,7 @@ uint _ma_get_binary_pack_key(MARIA_KEY *int_key, uint page_flag, uint nod_flag,
DBUG_ASSERT((int) length >= 0);
DBUG_PRINT("info",("key: 0x%lx from: 0x%lx length: %u",
(long) key, (long) from, length));
- memmove((uchar*) key, (uchar*) from, (size_t) length);
+ memmove(key, from, (size_t) length);
key+=length;
from+=length;
}