Commit 635b9d78 authored by unknown's avatar unknown

InnoDB: remove redundant functions mach_write() and mach_read()


innobase/include/mach0data.h:
  Remove mach_write() and mach_read()
innobase/include/mach0data.ic:
  Remove mach_write() and mach_read()
innobase/mem/mem0dbg.c:
  Replace mach_write() with mach_write_to_4()
  Replace mach_read() with mach_read_from_4()
parent 454b0192
...@@ -88,25 +88,6 @@ mach_read_from_4( ...@@ -88,25 +88,6 @@ mach_read_from_4(
/*=============*/ /*=============*/
/* out: ulint integer */ /* out: ulint integer */
byte* b); /* in: pointer to four bytes */ byte* b); /* in: pointer to four bytes */
/***********************************************************
The following function is used to store data from a ulint to memory
in standard order:
we store the most significant byte to the lowest address. */
UNIV_INLINE
void
mach_write(
/*=======*/
byte* b, /* in: pointer to sizeof(ulint) bytes where to store */
ulint n); /* in: ulint integer to be stored */
/************************************************************
The following function is used to fetch data from memory to a ulint.
The most significant byte is at the lowest address. */
UNIV_INLINE
ulint
mach_read(
/*======*/
/* out: ulint integer */
byte* b); /* in: pointer to sizeof(ulint) bytes */
/************************************************************* /*************************************************************
Writes a ulint in a compressed form. */ Writes a ulint in a compressed form. */
UNIV_INLINE UNIV_INLINE
......
...@@ -167,44 +167,6 @@ mach_read_from_4( ...@@ -167,44 +167,6 @@ mach_read_from_4(
#endif #endif
} }
/***********************************************************
The following function is used to store data from a ulint to memory
in standard order: we store the most significant byte to the lowest
address. */
UNIV_INLINE
void
mach_write(
/*=======*/
byte* b, /* in: pointer to 4 bytes where to store */
ulint n) /* in: ulint integer to be stored */
{
ut_ad(b);
b[0] = (byte)(n >> 24);
b[1] = (byte)(n >> 16);
b[2] = (byte)(n >> 8);
b[3] = (byte)n;
}
/************************************************************
The following function is used to fetch data from memory to a ulint.
The most significant byte is at the lowest address. */
UNIV_INLINE
ulint
mach_read(
/*======*/
/* out: ulint integer */
byte* b) /* in: pointer to 4 bytes */
{
ut_ad(b);
return( ((ulint)(b[0]) << 24)
+ ((ulint)(b[1]) << 16)
+ ((ulint)(b[2]) << 8)
+ (ulint)(b[3])
);
}
/************************************************************* /*************************************************************
Writes a ulint in a compressed form where the first byte codes the Writes a ulint in a compressed form where the first byte codes the
length of the stored ulint. We look at the most significant bits of length of the stored ulint. We look at the most significant bits of
......
...@@ -73,37 +73,37 @@ mem_field_header_set_len(byte* field, ulint len) ...@@ -73,37 +73,37 @@ mem_field_header_set_len(byte* field, ulint len)
{ {
ut_ad(len >= 0); ut_ad(len >= 0);
mach_write(field - 2 * sizeof(ulint), len); mach_write_to_4(field - 2 * sizeof(ulint), len);
} }
ulint ulint
mem_field_header_get_len(byte* field) mem_field_header_get_len(byte* field)
{ {
return(mach_read(field - 2 * sizeof(ulint))); return(mach_read_from_4(field - 2 * sizeof(ulint)));
} }
void void
mem_field_header_set_check(byte* field, ulint check) mem_field_header_set_check(byte* field, ulint check)
{ {
mach_write(field - sizeof(ulint), check); mach_write_to_4(field - sizeof(ulint), check);
} }
ulint ulint
mem_field_header_get_check(byte* field) mem_field_header_get_check(byte* field)
{ {
return(mach_read(field - sizeof(ulint))); return(mach_read_from_4(field - sizeof(ulint)));
} }
void void
mem_field_trailer_set_check(byte* field, ulint check) mem_field_trailer_set_check(byte* field, ulint check)
{ {
mach_write(field + mem_field_header_get_len(field), check); mach_write_to_4(field + mem_field_header_get_len(field), check);
} }
ulint ulint
mem_field_trailer_get_check(byte* field) mem_field_trailer_get_check(byte* field)
{ {
return(mach_read(field + return(mach_read_from_4(field +
mem_field_header_get_len(field))); mem_field_header_get_len(field)));
} }
......
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