From 6a4b3e652e7acffed3d026062355bf84274d69e7 Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 22 Nov 2006 20:45:14 +0000 Subject: [PATCH] inline the utf8 stuff git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@800 9efc2488-bf62-4759-914b-345cdb29e865 --- src/utils/utils.c | 8 ++++---- src/utils/utils.h | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/utils/utils.c b/src/utils/utils.c index 69d6093..58644a0 100644 --- a/src/utils/utils.c +++ b/src/utils/utils.c @@ -261,11 +261,11 @@ char* uescape( const char* string, int size, int full_escape ) { c ^= c; - if (!OSRF_UTF8_IS_ASCII((char)string[idx])) { - if (OSRF_UTF8_IS_START((char)string[idx])) { + if (!(string[idx] < 0x80)) { // not ASCII + if (string[idx]>= 0xc0 && string[idx] <= 0xfd) { // starts a UTF8 string do { - c = OSRF_UTF8_ACCUMULATE(c, string[idx]); - } while (OSRF_UTF8_IS_CONTINUATION(string[idx + 1] && idx++)); + c = (c << 6) | (string[idx] & 0x3f); // add this byte worth + } while ((string[idx + 1] >= 0x80 && string[idx + 1] <= 0xbf) && idx++); // and continue if there's more buffer_fadd(buf, "\\u%0.4x", c); } else return NULL; } else { diff --git a/src/utils/utils.h b/src/utils/utils.h index 8003bea..41aa488 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -31,15 +31,6 @@ GNU General Public License for more details. #include "md5.h" -#define OSRF_UTF8_IS_ASCII(_c) (((char)_c) < 0x80) -#define OSRF_UTF8_IS_START(_c) (((char)_c) >= 0xc0 && (((char)_c) <= 0xfd)) -#define OSRF_UTF8_IS_CONTINUATION(_c) (((char)_c) >= 0x80 && (((char)_c) <= 0xbf)) -#define OSRF_UTF8_IS_CONTINUED(_c) (((char)_c) & 0x80) - -#define OSRF_UTF8_CONTINUATION_MASK (0x3f) -#define OSRF_UTF8_ACCUMULATION_SHIFT 6 -#define OSRF_UTF8_ACCUMULATE(_o, _n) (((_o) << OSRF_UTF8_ACCUMULATION_SHIFT) | (((char)_n) & OSRF_UTF8_CONTINUATION_MASK)) - #define OSRF_MALLOC(ptr, size) \ ptr = (void*) malloc( size ); \ if( ptr == NULL ) { \ -- 2.43.2