database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-10-21 11:13:54 +03:00
Code Activity

Consolidate two different UTF8 encoders into a single subroutine.

Browse Source 
FossilOrigin-Name: 6208e494858b9d362efc7db4e8aac6f8e93fe51d2e038c94dfa97c55a74688a0
This commit is contained in:
drh
2025-02-25 11:47:34 +00:00
parent c46fbec350
commit a357a90f12
6 changed files with 45 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/func.c
View File

@@ -1149,34 +1149,6 @@ void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue, int bEscape){
}
}
/*
** Write a single UTF8 character whose value if v into the
** buffer starting at zOut. Return the number of bytes needed
** to encode that character.
*/
static int appendOneUtf8Char(char *zOut, u32 v){
if( v<0x00080 ){
zOut[0] = (u8)(v & 0xff);
return 1;
}
if( v<0x00800 ){
zOut[0] = 0xc0 + (u8)((v>>6) & 0x1f);
zOut[1] = 0x80 + (u8)(v & 0x3f);
return 2;
}
if( v<0x10000 ){
zOut[0] = 0xe0 + (u8)((v>>12) & 0x0f);
zOut[1] = 0x80 + (u8)((v>>6) & 0x3f);
zOut[2] = 0x80 + (u8)(v & 0x3f);
return 3;
}
zOut[0] = 0xf0 + (u8)((v>>18) & 0x07);
zOut[1] = 0x80 + (u8)((v>>12) & 0x3f);
zOut[2] = 0x80 + (u8)((v>>6) & 0x3f);
zOut[3] = 0x80 + (u8)(v & 0x3f);
return 4;
}
/*
** Return true if z[] begins with N hexadecimal digits, and write
** a decoding of those digits into *pVal. Or return false if any
@@ -1248,19 +1220,19 @@ static void unistrFunc(
}else if( sqlite3Isxdigit(zIn[i+1]) ){
if( !isNHex(&zIn[i+1], 4, &v) ) goto unistr_error;
i += 5;
j += appendOneUtf8Char(&zOut[j], v);
j += sqlite3AppendOneUtf8Character(&zOut[j], v);
}else if( zIn[i+1]=='+' ){
if( !isNHex(&zIn[i+2], 6, &v) ) goto unistr_error;
i += 8;
j += appendOneUtf8Char(&zOut[j], v);
j += sqlite3AppendOneUtf8Character(&zOut[j], v);
}else if( zIn[i+1]=='u' ){
if( !isNHex(&zIn[i+2], 4, &v) ) goto unistr_error;
i += 6;
j += appendOneUtf8Char(&zOut[j], v);
j += sqlite3AppendOneUtf8Character(&zOut[j], v);
}else if( zIn[i+1]=='U' ){
if( !isNHex(&zIn[i+2], 8, &v) ) goto unistr_error;
i += 10;
j += appendOneUtf8Char(&zOut[j], v);
j += sqlite3AppendOneUtf8Character(&zOut[j], v);
}else{
goto unistr_error;
}