database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Reducing duplicate code and simplifying well formed string copying

Browse Source 
by adding a new class String_copier.

This is a pre-requisite patch for MDEV-6566 and MDEV-6572,
to avoid adding more similar code.
This commit is contained in:
Alexander Barkov
2015-02-27 16:26:12 +04:00
parent 2d01907c1d
commit 72d7b12b9c
7 changed files with 164 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/perfschema/table_session_connect.cc
View File

@@ -61,8 +61,7 @@ bool parse_length_encoded_string(const char **ptr,
uint nchars_max)
{
ulong copy_length, data_length;
const char *well_formed_error_pos= NULL, *cannot_convert_error_pos= NULL,
*from_end_pos= NULL;
String_copier copier;
copy_length= data_length= net_field_length((uchar **) ptr);
@@ -73,11 +72,8 @@ bool parse_length_encoded_string(const char **ptr,
if (*ptr - start_ptr + data_length > input_length)
return true;
copy_length= well_formed_copy_nchars(&my_charset_utf8_bin, dest, dest_size,
from_cs, *ptr, data_length, nchars_max,
&well_formed_error_pos,
&cannot_convert_error_pos,
&from_end_pos);
copy_length= copier.well_formed_copy(&my_charset_utf8_bin, dest, dest_size,
from_cs, *ptr, data_length, nchars_max);
*copied_len= copy_length;
(*ptr)+= data_length;