summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2004-03-04 08:50:37 +0200
committermonty@mashka.mysql.fi <>2004-03-04 08:50:37 +0200
commitafd8f38f4e16bce5881ffe3734f17fd18eb30f21 (patch)
treef335ad0e2c6634a947a95d62cbee9a54ee9303e8 /sql/sql_string.cc
parent3baf20ab04f84899da057aed7313911e3e7d0e7b (diff)
downloadmariadb-git-afd8f38f4e16bce5881ffe3734f17fd18eb30f21.tar.gz
Optimized GIS functions
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index c6eda5f9fb2..e15beac90b0 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -126,8 +126,8 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs)
str_charset=cs;
if (decimals >= NOT_FIXED_DEC)
{
- sprintf(buff,"%.14g",num); // Enough for a DATETIME
- return copy(buff, (uint32) strlen(buff), &my_charset_latin1, cs);
+ uint32 len= my_sprintf(buff,(buff, "%.14g",num));// Enough for a DATETIME
+ return copy(buff, len, &my_charset_latin1, cs);
}
#ifdef HAVE_FCONVERT
int decpt,sign;
@@ -671,9 +671,8 @@ int String::reserve(uint32 space_needed, uint32 grow_by)
return FALSE;
}
-void String::qs_append(const char *str)
+void String::qs_append(const char *str, uint32 len)
{
- int len = strlen(str);
memcpy(Ptr + str_length, str, len + 1);
str_length += len;
}
@@ -681,8 +680,7 @@ void String::qs_append(const char *str)
void String::qs_append(double d)
{
char *buff = Ptr + str_length;
- sprintf(buff,"%.14g", d);
- str_length += strlen(buff);
+ str_length+= my_sprintf(buff, (buff, "%.14g", d));
}
void String::qs_append(double *d)
@@ -692,12 +690,6 @@ void String::qs_append(double *d)
qs_append(ld);
}
-void String::qs_append(const char &c)
-{
- Ptr[str_length] = c;
- str_length += sizeof(c);
-}
-
/*
Compare strings according to collation, without end space.