mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
2d1384e442
produce hex digits in lower case). (fixed version) Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays. Added extra argument to int2str function which controls case of digits you get. Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str() function. Removed unused my_itoa/my_ltoa functions. client/mysql.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. client/mysqladmin.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. dbug/dbug.c: _dig_vec became _dig_vec_upper. include/m_string.h: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. my_itoa()/my_ltoa() functions were removed because they were never used in our code. int2str() now has one more argument which controls case of digits it will produce. include/my_global.h: my_itoa()/my_ltoa() functions were removed because they were never used in our code. isam/isamchk.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. libmysql/libmysql.def: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. myisam/myisamchk.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. mysys/mf_tempfile.c: _dig_vec became _dig_vec_upper. mysys/my_error.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. mysys/my_tempnam.c: _dig_vec became _dig_vec_upper. sql-common/client.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. sql/item_strfunc.cc: _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we have _dig_vec_lower instead. sql/mysqld.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. sql/password.c: _dig_vec became _dig_vec_upper. sql/sql_bitmap.h: _dig_vec became _dig_vec_upper. strings/int2str.c: Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair. int2str() now has one more argument which controls case of digits it will produce. my_itoa()/my_ltoa() functions were removed because they were never used in our code. strings/longlong2str-x86.s: _dig_vec became _dig_vec_upper. strings/longlong2str.c: _dig_vec became _dig_vec_upper. strings/my_vsnprintf.c: If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits to be snprintf() compatible.
140 lines
3.5 KiB
C
140 lines
3.5 KiB
C
/* Copyright (C) 2000 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/*
|
|
Defines: longlong2str();
|
|
|
|
longlong2str(dst, radix, val)
|
|
converts the (longlong) integer "val" to character form and moves it to
|
|
the destination string "dst" followed by a terminating NUL. The
|
|
result is normally a pointer to this NUL character, but if the radix
|
|
is dud the result will be NullS and nothing will be changed.
|
|
|
|
If radix is -2..-36, val is taken to be SIGNED.
|
|
If radix is 2.. 36, val is taken to be UNSIGNED.
|
|
That is, val is signed if and only if radix is. You will normally
|
|
use radix -10 only through itoa and ltoa, for radix 2, 8, or 16
|
|
unsigned is what you generally want.
|
|
|
|
_dig_vec is public just in case someone has a use for it.
|
|
The definitions of itoa and ltoa are actually macros in m_string.h,
|
|
but this is where the code is.
|
|
|
|
Note: The standard itoa() returns a pointer to the argument, when int2str
|
|
returns the pointer to the end-null.
|
|
itoa assumes that 10 -base numbers are allways signed and other arn't.
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include "m_string.h"
|
|
|
|
#if defined(HAVE_LONG_LONG) && !defined(longlong2str) && !defined(HAVE_LONGLONG2STR)
|
|
|
|
/*
|
|
This assumes that longlong multiplication is faster than longlong division.
|
|
*/
|
|
|
|
char *longlong2str(longlong val,char *dst,int radix)
|
|
{
|
|
char buffer[65];
|
|
register char *p;
|
|
long long_val;
|
|
|
|
if (radix < 0)
|
|
{
|
|
if (radix < -36 || radix > -2) return (char*) 0;
|
|
if (val < 0) {
|
|
*dst++ = '-';
|
|
val = -val;
|
|
}
|
|
radix = -radix;
|
|
}
|
|
else
|
|
{
|
|
if (radix > 36 || radix < 2) return (char*) 0;
|
|
}
|
|
if (val == 0)
|
|
{
|
|
*dst++='0';
|
|
*dst='\0';
|
|
return dst;
|
|
}
|
|
p = &buffer[sizeof(buffer)-1];
|
|
*p = '\0';
|
|
|
|
while ((ulonglong) val > (ulonglong) LONG_MAX)
|
|
{
|
|
ulonglong quo=(ulonglong) val/(uint) radix;
|
|
uint rem= (uint) (val- quo* (uint) radix);
|
|
*--p = _dig_vec_upper[rem];
|
|
val= quo;
|
|
}
|
|
long_val= (long) val;
|
|
while (long_val != 0)
|
|
{
|
|
long quo= long_val/radix;
|
|
*--p = _dig_vec_upper[(uchar) (long_val - quo*radix)];
|
|
long_val= quo;
|
|
}
|
|
while ((*dst++ = *p++) != 0) ;
|
|
return dst-1;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifndef longlong10_to_str
|
|
char *longlong10_to_str(longlong val,char *dst,int radix)
|
|
{
|
|
char buffer[65];
|
|
register char *p;
|
|
long long_val;
|
|
|
|
if (radix < 0)
|
|
{
|
|
if (val < 0)
|
|
{
|
|
*dst++ = '-';
|
|
val = -val;
|
|
}
|
|
}
|
|
|
|
if (val == 0)
|
|
{
|
|
*dst++='0';
|
|
*dst='\0';
|
|
return dst;
|
|
}
|
|
p = &buffer[sizeof(buffer)-1];
|
|
*p = '\0';
|
|
|
|
while ((ulonglong) val > (ulonglong) LONG_MAX)
|
|
{
|
|
ulonglong quo=(ulonglong) val/(uint) 10;
|
|
uint rem= (uint) (val- quo* (uint) 10);
|
|
*--p = _dig_vec_upper[rem];
|
|
val= quo;
|
|
}
|
|
long_val= (long) val;
|
|
while (long_val != 0)
|
|
{
|
|
long quo= long_val/10;
|
|
*--p = _dig_vec_upper[(uchar) (long_val - quo*10)];
|
|
long_val= quo;
|
|
}
|
|
while ((*dst++ = *p++) != 0) ;
|
|
return dst-1;
|
|
}
|
|
#endif
|