aboutsummaryrefslogtreecommitdiffstats
path: root/src/utf8.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2006-07-17 21:46:32 +0000
committerWarren Dukes <warren.dukes@gmail.com>2006-07-17 21:46:32 +0000
commit0bf396d610a78a16e49fe72f9ba4aa9a49a6053c (patch)
tree256510d9881995736292afa522a3c38b7d2aee20 /src/utf8.c
parent7fdcd56a99f4c302d0e56c68e9c9db22d59b31b5 (diff)
downloadmpd-0bf396d610a78a16e49fe72f9ba4aa9a49a6053c.tar.gz
mpd-0bf396d610a78a16e49fe72f9ba4aa9a49a6053c.tar.xz
mpd-0bf396d610a78a16e49fe72f9ba4aa9a49a6053c.zip
some quick hacks to avoid signedness warnings with gcc4
git-svn-id: https://svn.musicpd.org/mpd/trunk@4387 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/utf8.c')
-rw-r--r--src/utf8.c40
1 files changed, 22 insertions, 18 deletions
diff --git a/src/utf8.c b/src/utf8.c
index c0b7d694a..3c2f3716e 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -22,30 +22,31 @@
#include <string.h>
#include <stdlib.h>
-static unsigned char * latin1ToUtf8(unsigned char c) {
+static char * latin1ToUtf8(char c) {
static unsigned char utf8[3];
+ unsigned char uc = c;
memset(utf8,0,3);
- if(c < 128) utf8[0] = c;
- else if(c<192) {
+ if(uc < 128) utf8[0] = uc;
+ else if(uc<192) {
utf8[0] = 194;
- utf8[1] = c;
+ utf8[1] = uc;
}
else {
utf8[0] = 195;
- utf8[1] = c-64;
+ utf8[1] = uc-64;
}
- return utf8;
+ return (char *)utf8;
}
-unsigned char * latin1StrToUtf8Dup(unsigned char * latin1) {
+char * latin1StrToUtf8Dup(char * latin1) {
/* utf8 should have at most two char's per latin1 char */
int len = strlen(latin1)*2+1;
- unsigned char * ret = malloc(len);
- unsigned char * cp = ret;
- unsigned char * utf8;
+ char * ret = malloc(len);
+ char * cp = ret;
+ char * utf8;
memset(ret,0,len);
@@ -63,21 +64,24 @@ unsigned char * latin1StrToUtf8Dup(unsigned char * latin1) {
return realloc(ret,len+1);
}
-static unsigned char utf8ToLatin1(unsigned char * utf8) {
+static char utf8ToLatin1(char * inUtf8) {
unsigned char c = 0;
+ unsigned char * utf8 = (unsigned char *)inUtf8;
if(utf8[0]<128) return utf8[0];
else if(utf8[0]==195) c+=64;
else if(utf8[0]!=194) return '?';
- return c+utf8[1];
+ return (char)(c+utf8[1]);
}
-static int validateUtf8Char(unsigned char * utf8Char) {
+static int validateUtf8Char(char * inUtf8Char) {
+ unsigned char * utf8Char = (unsigned char *)inUtf8Char;
+
if(utf8Char[0]<0x80) return 1;
if(utf8Char[0]>=0xC0 && utf8Char[0]<=0xFD) {
int count = 1;
- unsigned char t = 1 << 5;
+ char t = 1 << 5;
int i;
while(count < 6 && (t & utf8Char[0])) {
t = (t >> 1);
@@ -92,7 +96,7 @@ static int validateUtf8Char(unsigned char * utf8Char) {
else return 0;
}
-int validUtf8String(unsigned char * string) {
+int validUtf8String(char * string) {
int ret;
while(*string) {
@@ -104,11 +108,11 @@ int validUtf8String(unsigned char * string) {
return 1;
}
-unsigned char * utf8StrToLatin1Dup(unsigned char * utf8) {
+char * utf8StrToLatin1Dup(char * utf8) {
/* utf8 should have at most two char's per latin1 char */
int len = strlen(utf8)+1;
- unsigned char * ret = malloc(len);
- unsigned char * cp = ret;
+ char * ret = malloc(len);
+ char * cp = ret;
int count;
memset(ret,0,len);