pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fast_char_convert function changed

pull/10/head
yuqing 2016-11-26 13:04:45 +08:00
parent 33085e9bf6
commit 562513b358
2 changed files with 36 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/char_converter.c
View File

@ -85,83 +85,62 @@ void char_converter_set_pair_ex(FastCharConverter *pCharConverter,
}
int fast_char_convert(FastCharConverter *pCharConverter,
char *text, int *text_len, const int max_size)
const char *input, const int input_len,
char *output, int *out_len, const int out_size)
{
int count;
unsigned char *p;
unsigned char *pi;
unsigned char *po;
unsigned char *end;
char fixed_buff[16 * 1024];
char *buff;
int max_size_sub1;
int out_size_sub1;
int remain_len;
if (pCharConverter->count <= 0) {
return 0;
}
count = 0;
end = (unsigned char *)text + *text_len;
for (p=(unsigned char *)text; p<end; p++)
{
if (pCharConverter->char_table[*p].op != FAST_CHAR_OP_NONE)
{
if (pCharConverter->char_table[*p].op == FAST_CHAR_OP_ADD_BACKSLASH) {
break;
}
*p = pCharConverter->char_table[*p].dest;
++count;
}
}
remain_len = end - p;
if (remain_len == 0) {
return count;
}
if (remain_len < sizeof(fixed_buff)) {
buff = fixed_buff;
po = (unsigned char *)output;
if (out_size >= input_len) {
end = (unsigned char *)input + input_len;
} else {
buff = (char *)malloc(remain_len);
if (buff == NULL) {
logError("file: "__FILE__", line: %d, "
"malloc %d bytes fail", __LINE__, remain_len);
return count;
end = (unsigned char *)input + out_size;
}
}
memcpy(buff, p, remain_len);
max_size_sub1 = max_size - 1;
end = (unsigned char *)buff + remain_len;
for (pi=(unsigned char *)buff; pi<end; pi++)
{
if (p - (unsigned char *)text >= max_size_sub1)
{
logWarning("file: "__FILE__", line: %d, "
"exceeds max size: %d", __LINE__, max_size);
for (pi=(unsigned char *)input; pi<end; pi++) {
if (pCharConverter->char_table[*pi].op != FAST_CHAR_OP_NONE) {
if (pCharConverter->char_table[*pi].op == FAST_CHAR_OP_ADD_BACKSLASH) {
break;
}
if (pCharConverter->char_table[*pi].op != FAST_CHAR_OP_NONE)
{
if (pCharConverter->char_table[*pi].op == FAST_CHAR_OP_ADD_BACKSLASH)
{
*p++ = '\\';
}
*p++ = pCharConverter->char_table[*pi].dest;
*po++ = pCharConverter->char_table[*pi].dest;
++count;
}
else
{
*p++ = *pi;
} else {
*po++ = *pi;
}
}
if (buff != fixed_buff) {
free(buff);
}
*text_len = p - (unsigned char *)text;
remain_len = end - pi;
if (remain_len == 0) {
*out_len = po - (unsigned char *)output;
return count;
}
out_size_sub1 = out_size - 1;
for (; pi<end; pi++) {
if (po - (unsigned char *)output >= out_size_sub1) {
logWarning("file: "__FILE__", line: %d, "
"exceeds max size: %d", __LINE__, out_size);
break;
}
if (pCharConverter->char_table[*pi].op != FAST_CHAR_OP_NONE) {
if (pCharConverter->char_table[*pi].op == FAST_CHAR_OP_ADD_BACKSLASH) {
*po++ = '\\';
}
*po++ = pCharConverter->char_table[*pi].dest;
++count;
} else {
*po++ = *pi;
}
}
*out_len = po - (unsigned char *)output;
return count;
}

11
src/char_converter.h
View File

@ -97,13 +97,16 @@ void char_converter_set_pair_ex(FastCharConverter *pCharConverter,
* char convert function
* parameters:
* pCharConverter: the char converter
* text: the text to convert (input and output)
* text_len: the length of text (input and output)
* max_size: max buff size
* input: the input to convert
* input_len: the length of input
* output: the input to convert
* out_len: the length of output
* out_size: output buff size
* return: converted char count
*/
int fast_char_convert(FastCharConverter *pCharConverter,
char *text, int *text_len, const int max_size);
const char *input, const int input_len,
char *output, int *out_len, const int out_size);
#ifdef __cplusplus
}