devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

A bit more readable code. Also saves one buffer.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13222 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-04-20 17:35:05 +00:00
parent b7d93d0673
commit 49be3faf07
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uisimulator/common/io.c
View file

@ -64,24 +64,25 @@ extern const unsigned char* utf8decode(const unsigned char *utf8,
unsigned short *ucs); unsigned short *ucs);
extern unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8); extern unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8);
/* UTF-8 <-> UCS2 conversion. Note that these functions aren't thread safe /* Static buffers for the conversion results. This isn't thread safe,
* due to the use of static buffers. */ * but it's sufficient for rockbox. */
static wchar_t* utf8_to_ucs2(const unsigned char *utf8, int index) static unsigned char convbuf1[3*MAX_PATH];
static unsigned char convbuf2[3*MAX_PATH];
static wchar_t* utf8_to_ucs2(const unsigned char *utf8, void *buffer)
{ {
static wchar_t wbuffer[2][MAX_PATH]; wchar_t *ucs = buffer;
wchar_t *ucs = wbuffer[index];
while (*utf8) while (*utf8)
utf8 = utf8decode(utf8, ucs++); utf8 = utf8decode(utf8, ucs++);
*ucs = 0; *ucs = 0;
return wbuffer[index]; return buffer;
} }
static unsigned char *ucs2_to_utf8(const wchar_t *ucs) static unsigned char *ucs2_to_utf8(const wchar_t *ucs, unsigned char *buffer)
{ {
static unsigned char buffer[3*MAX_PATH];
unsigned char *utf8 = buffer; unsigned char *utf8 = buffer;
while (*ucs) while (*ucs)
utf8 = utf8encode(*ucs++, utf8); utf8 = utf8encode(*ucs++, utf8);
@ -89,8 +90,8 @@ static unsigned char *ucs2_to_utf8(const wchar_t *ucs)
return buffer; return buffer;
} }
#define UTF8_TO_OS(a) utf8_to_ucs2(a,0) #define UTF8_TO_OS(a) utf8_to_ucs2(a,convbuf1)
#define OS_TO_UTF8(a) ucs2_to_utf8(a) #define OS_TO_UTF8(a) ucs2_to_utf8(a,convbuf1)
#define DIR_T _WDIR #define DIR_T _WDIR
#define DIRENT_T struct _wdirent #define DIRENT_T struct _wdirent
#define STAT_T struct _stat #define STAT_T struct _stat
@ -104,7 +105,7 @@ extern int _wrmdir(const wchar_t*);
#define STAT(a,b) (_wstat)(UTF8_TO_OS(a),b) #define STAT(a,b) (_wstat)(UTF8_TO_OS(a),b)
#define OPEN(a,b,c) (_wopen)(UTF8_TO_OS(a),b,c) #define OPEN(a,b,c) (_wopen)(UTF8_TO_OS(a),b,c)
#define REMOVE(a) (_wremove)(UTF8_TO_OS(a)) #define REMOVE(a) (_wremove)(UTF8_TO_OS(a))
#define RENAME(a,b) (_wrename)(UTF8_TO_OS(a),utf8_to_ucs2(b,1)) #define RENAME(a,b) (_wrename)(UTF8_TO_OS(a),utf8_to_ucs2(b,convbuf2))
#else /* !__MINGW32__ */ #else /* !__MINGW32__ */