summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-11-18 11:36:15 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 10:41:51 +0100
commitd2a78def63687ca7068acd9ec3bb4e45b14d49c6 (patch)
tree00b08455a2ebecce30efbdbd7a2ce8dd89cfa821
parent20c3b2ff807b07610ed9012f31fce0ba68d522b0 (diff)
downloadmariadb-git-d2a78def63687ca7068acd9ec3bb4e45b14d49c6.tar.gz
cleanup: ptr_cmp
1. don't cast size_t* to int* 2. remove long obsolete register specifier
-rw-r--r--mysys/ptr_cmp.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/mysys/ptr_cmp.c b/mysys/ptr_cmp.c
index a481b4d961c..d4daf2b1ec5 100644
--- a/mysys/ptr_cmp.c
+++ b/mysys/ptr_cmp.c
@@ -88,8 +88,8 @@ qsort2_cmp get_ptr_compare (size_t size)
static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
{
- reg3 int length= *compare_length;
- reg1 uchar *first,*last;
+ size_t length= *compare_length;
+ uchar *first,*last;
first= *a; last= *b;
while (--length)
@@ -103,8 +103,8 @@ static int ptr_compare(size_t *compare_length, uchar **a, uchar **b)
static int ptr_compare_0(size_t *compare_length,uchar **a, uchar **b)
{
- reg3 int length= *compare_length;
- reg1 uchar *first,*last;
+ size_t length= *compare_length;
+ uchar *first,*last;
first= *a; last= *b;
loop:
@@ -124,8 +124,8 @@ static int ptr_compare_0(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_1(size_t *compare_length,uchar **a, uchar **b)
{
- reg3 int length= *compare_length-1;
- reg1 uchar *first,*last;
+ size_t length= *compare_length-1;
+ uchar *first,*last;
first= *a+1; last= *b+1;
cmp(-1);
@@ -145,8 +145,8 @@ static int ptr_compare_1(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_2(size_t *compare_length,uchar **a, uchar **b)
{
- reg3 int length= *compare_length-2;
- reg1 uchar *first,*last;
+ size_t length= *compare_length-2;
+ uchar *first,*last;
first= *a +2 ; last= *b +2;
cmp(-2);
@@ -167,8 +167,8 @@ static int ptr_compare_2(size_t *compare_length,uchar **a, uchar **b)
static int ptr_compare_3(size_t *compare_length,uchar **a, uchar **b)
{
- reg3 int length= *compare_length-3;
- reg1 uchar *first,*last;
+ size_t length= *compare_length-3;
+ uchar *first,*last;
first= *a +3 ; last= *b +3;
cmp(-3);