Bug #25950778: REMOVE POINTER ARITHMETIC MACROS

Remove the unneeded macros ADD_TO_PTR and PTR_BYTE_DIFF.

Change-Id: I2a49542de36c62f19bdaf232651293cc60c4c394

Author: Steinar H. Gunderson

client/mysqltest.cc

@@ -11763,10 +11763,9 @@ int insert_pointer_name(POINTER_ARRAY *pa,char * name)
       DBUG_RETURN(1);
     if (new_pos != pa->str)
     {
-      my_ptrdiff_t diff=PTR_BYTE_DIFF(new_pos,pa->str);
+      ptrdiff_t diff= new_pos - pa->str;
       for (i=0 ; i < pa->typelib.count ; i++)
-	pa->typelib.type_names[i]= ADD_TO_PTR(pa->typelib.type_names[i],diff,
-					      char*);
+	pa->typelib.type_names[i]= pa->typelib.type_names[i] + diff;
       pa->str=new_pos;
     }
     pa->max_length= pa->length+length+PS_MALLOC;

include/my_pointer_arithmetic.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,12 +23,7 @@
   of buffers to a given size.
 */
 
-#include "my_inttypes.h"
-
 #define MY_ALIGN(A,L)   (((A) + (L) - 1) & ~((L) - 1))
 #define ALIGN_SIZE(A)   MY_ALIGN((A),sizeof(double))
-/* Size to make adressable obj. */
-#define ADD_TO_PTR(ptr,size,type) (type) ((uchar*) (ptr)+size)
-#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((uchar*) (A) - (uchar*) (B))
 
 #endif  // MY_POINTER_ARITHMETIC_INCLUDED

mysys/mf_keycache.cc

@@ -1856,9 +1856,7 @@ static BLOCK_LINK *find_key_block(KEY_CACHE *keycache,
           block= &keycache->block_root[keycache->blocks_used];
           block_mem_offset= 
            ((size_t) keycache->blocks_used) * keycache->key_cache_block_size;
-          block->buffer= ADD_TO_PTR(keycache->block_mem,
-                                    block_mem_offset,
-                                    uchar*);
+          block->buffer= keycache->block_mem + block_mem_offset;
           keycache->blocks_used++;
           DBUG_ASSERT(!block->next_used);
         }

sql/field.h

@@ -1377,9 +1377,9 @@ class Field: public Proto_field, public Sql_alloc
 
   virtual void move_field_offset(my_ptrdiff_t ptr_diff)
   {
-    ptr= ADD_TO_PTR(ptr, ptr_diff, uchar*);
+    ptr+= ptr_diff;
     if (real_maybe_null())
-      m_null_ptr= ADD_TO_PTR(m_null_ptr, ptr_diff, uchar*);
+      m_null_ptr+= ptr_diff;
   }
 
   virtual void get_image(uchar *buff, size_t length, const CHARSET_INFO*)
@@ -3910,7 +3910,7 @@ class Field_blob :public Field_longstr {
     }
   void set_ptr_offset(my_ptrdiff_t ptr_diff, uint32 length, uchar *data)
     {
-      uchar *ptr_ofs= ADD_TO_PTR(ptr,ptr_diff,uchar*);
+      uchar *ptr_ofs= ptr + ptr_diff;
       store_length(ptr_ofs, packlength, length);
       memcpy(ptr_ofs+packlength, &data, sizeof(char*));
     }
@@ -4433,7 +4433,7 @@ class Field_bit :public Field {
   void move_field_offset(my_ptrdiff_t ptr_diff)
   {
     Field::move_field_offset(ptr_diff);
-    bit_ptr= ADD_TO_PTR(bit_ptr, ptr_diff, uchar*);
+    bit_ptr+= ptr_diff;
   }
   void hash(ulong *nr, ulong *nr2);
   Field_bit *clone(MEM_ROOT *mem_root) const { 

storage/myisam/mi_packrec.c

@@ -277,11 +277,10 @@ bool _mi_read_pack_info(MI_INFO *info, bool fix_keys)
 	       MYF(MY_HOLD_ON_ERROR));
   /* Fix the table addresses in the tree heads. */
   {
-    my_ptrdiff_t diff=PTR_BYTE_DIFF(decode_table,share->decode_tables);
+    ptrdiff_t diff= decode_table - share->decode_tables;
     share->decode_tables=decode_table;
     for (i=0 ; i < trees ; i++)
-      share->decode_trees[i].table=ADD_TO_PTR(share->decode_trees[i].table,
-                                              diff, uint16*);
+      share->decode_trees[i].table= share->decode_trees[i].table + diff;
   }
 
   /* Fix record-ref-length for keys */