From 8216c759ec0c77afe2ff9264a3b35a85248c1fe6 Mon Sep 17 00:00:00 2001 From: divverent Date: Tue, 29 Dec 2009 07:09:06 +0000 Subject: [PATCH] improve the just added macros to not cause anything unexpected if passed a wrong pointer type git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9731 d7cf8633-e32d-0410-b094-e92efae38249 --- utf8lib.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utf8lib.h b/utf8lib.h index 055b75a7..35bd5a6f 100644 --- a/utf8lib.h +++ b/utf8lib.h @@ -52,11 +52,11 @@ size_t u8_strpad(char *out, size_t outsize, const char *in, qboolean leftalign, */ extern Uchar u8_quake2utf8map[256]; // these defines get a bit tricky, as c and e may be aliased to the same variable -#define u8_getchar(c,e) (utf8_enable.integer ? u8_getchar_utf8_enabled(c,e) : (u8_quake2utf8map[((unsigned char *)(*(e) = (c) + 1))[-1]])) -#define u8_getchar_noendptr(c) (utf8_enable.integer ? u8_getchar_utf8_enabled(c,NULL) : (u8_quake2utf8map[*((unsigned char *)c)])) +#define u8_getchar(c,e) (utf8_enable.integer ? u8_getchar_utf8_enabled(c,e) : (u8_quake2utf8map[(*((unsigned char **)(e)) = ((unsigned char *)(c)) + 1)[-1]])) +#define u8_getchar_noendptr(c) (utf8_enable.integer ? u8_getchar_utf8_enabled(c,NULL) : (u8_quake2utf8map[*((unsigned char *)(c))])) #define u8_getchar_check(c,e) ((e) ? u8_getchar((c),(e)) : u8_getchar_noendptr((c))) -#define u8_getnchar(c,e,n) (utf8_enable.integer ? u8_getnchar_utf8_enabled(c,e,n) : ((n) <= 0 ? ((*(e) = c), 0) : (u8_quake2utf8map[((unsigned char *)(*(e) = (c) + 1))[-1]]))) -#define u8_getnchar_noendptr(c,n) (utf8_enable.integer ? u8_getnchar_utf8_enabled(c,NULL,n) : ((n) <= 0 ? 0 : (u8_quake2utf8map[*((unsigned char *)c)]))) +#define u8_getnchar(c,e,n) (utf8_enable.integer ? u8_getnchar_utf8_enabled(c,e,n) : ((n) <= 0 ? ((*(e) = c), 0) : (u8_quake2utf8map[(*((unsigned char **)(e)) = ((unsigned char *)(c)) + 1)[-1]]))) +#define u8_getnchar_noendptr(c,n) (utf8_enable.integer ? u8_getnchar_utf8_enabled(c,NULL,n) : ((n) <= 0 ? 0 : (u8_quake2utf8map[*((unsigned char *)(c))]))) #define u8_getnchar_check(c,e,n) ((e) ? u8_getchar((c),(e),(n)) : u8_getchar_noendptr((c),(n))) #endif // UTF8LIB_H__ -- 2.39.2