mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
088e2395f1
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
109 lines
2.5 KiB
C
109 lines
2.5 KiB
C
/* Copyright (C) 2005 MySQL AB
|
|
|
|
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 the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Variable length encoding.
|
|
|
|
A method to store an arbitrary-size non-negative integer. We let the
|
|
most significant bit of the number indicate that the next byte
|
|
should be contatenated to form the real number.
|
|
*/
|
|
|
|
#include "my_vle.h"
|
|
|
|
/*
|
|
Function to encode an unsigned long as VLE. The bytes for the VLE
|
|
will be written to the location pointed to by 'out'. The maximum
|
|
number of bytes written will be 'max'.
|
|
|
|
PARAMETERS
|
|
|
|
out Pointer to beginning of where to store VLE bytes.
|
|
max Maximum number of bytes to write.
|
|
n Number to encode.
|
|
|
|
RETURN VALUE
|
|
On success, one past the end of the array containing the VLE
|
|
bytes. On failure, the 'out' pointer is returned.
|
|
*/
|
|
|
|
uchar*
|
|
my_vle_encode(uchar* out, size_t max, ulong n)
|
|
{
|
|
uchar buf[my_vle_sizeof(n)];
|
|
uchar *ptr= buf;
|
|
size_t len;
|
|
|
|
do
|
|
{
|
|
*ptr++= (uchar) (n & 0x7F);
|
|
n>>= 7;
|
|
}
|
|
while (n > 0);
|
|
|
|
len= ptr - buf;
|
|
|
|
if (len <= max)
|
|
{
|
|
/*
|
|
The bytes are stored in reverse order in 'buf'. Let's write them
|
|
in correct order to the output buffer and set the MSB at the
|
|
same time.
|
|
*/
|
|
while (ptr-- > buf)
|
|
{
|
|
uchar v= *ptr;
|
|
if (ptr > buf)
|
|
v|= 0x80;
|
|
*out++= v;
|
|
}
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
/*
|
|
Function to decode a VLE representation of an integral value.
|
|
|
|
|
|
PARAMETERS
|
|
|
|
result_ptr Pointer to an unsigned long where the value will be written.
|
|
vle Pointer to the VLE bytes.
|
|
|
|
RETURN VALUE
|
|
|
|
One-past the end of the VLE bytes. The routine will never read
|
|
more than sizeof(*result_ptr) + 1 bytes.
|
|
*/
|
|
|
|
uchar const*
|
|
my_vle_decode(ulong *result_ptr, uchar const *vle)
|
|
{
|
|
ulong result= 0;
|
|
size_t cnt= 1;
|
|
|
|
do
|
|
{
|
|
result<<= 7;
|
|
result|= (*vle & 0x7F);
|
|
}
|
|
while ((*vle++ & 0x80) && ++cnt <= sizeof(*result_ptr) + 1);
|
|
|
|
if (cnt <= sizeof(*result_ptr) + 1)
|
|
*result_ptr= result;
|
|
|
|
return vle;
|
|
}
|