aboutsummaryrefslogtreecommitdiffstats
path: root/src/utf8.c
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-20 16:02:40 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-20 16:02:40 +0000
commit29a25b9933b32800f58dd73d5d1fc21993071c92 (patch)
tree4f456a6f8e44d42acc289c35534ea3e59c0aa96f /src/utf8.c
parent099f0e103f7591eef81183292d704b3a77a99018 (diff)
downloadmpd-29a25b9933b32800f58dd73d5d1fc21993071c92.tar.gz
mpd-29a25b9933b32800f58dd73d5d1fc21993071c92.tar.xz
mpd-29a25b9933b32800f58dd73d5d1fc21993071c92.zip
Add mpd-indent.sh
Indent the entire tree, hopefully we can keep it indented. git-svn-id: https://svn.musicpd.org/mpd/trunk@4410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/utf8.c')
-rw-r--r--src/utf8.c109
1 files changed, 61 insertions, 48 deletions
diff --git a/src/utf8.c b/src/utf8.c
index 3c2f3716e..4ac41516b 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -22,113 +22,126 @@
#include <string.h>
#include <stdlib.h>
-static char * latin1ToUtf8(char c) {
+static char *latin1ToUtf8(char c)
+{
static unsigned char utf8[3];
unsigned char uc = c;
- memset(utf8,0,3);
+ memset(utf8, 0, 3);
- if(uc < 128) utf8[0] = uc;
- else if(uc<192) {
+ if (uc < 128)
+ utf8[0] = uc;
+ else if (uc < 192) {
utf8[0] = 194;
utf8[1] = uc;
- }
- else {
+ } else {
utf8[0] = 195;
- utf8[1] = uc-64;
+ utf8[1] = uc - 64;
}
return (char *)utf8;
}
-char * latin1StrToUtf8Dup(char * latin1) {
+char *latin1StrToUtf8Dup(char *latin1)
+{
/* utf8 should have at most two char's per latin1 char */
- int len = strlen(latin1)*2+1;
- char * ret = malloc(len);
- char * cp = ret;
- char * utf8;
+ int len = strlen(latin1) * 2 + 1;
+ char *ret = malloc(len);
+ char *cp = ret;
+ char *utf8;
- memset(ret,0,len);
+ memset(ret, 0, len);
len = 0;
- while(*latin1) {
+ while (*latin1) {
utf8 = latin1ToUtf8(*latin1);
- while(*utf8) {
+ while (*utf8) {
*(cp++) = *(utf8++);
len++;
}
latin1++;
}
- return realloc(ret,len+1);
+ return realloc(ret, len + 1);
}
-static char utf8ToLatin1(char * inUtf8) {
+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 (char)(c+utf8[1]);
+ 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 (char)(c + utf8[1]);
}
-static int validateUtf8Char(char * inUtf8Char) {
- unsigned char * utf8Char = (unsigned char *)inUtf8Char;
+static int validateUtf8Char(char *inUtf8Char)
+{
+ unsigned char *utf8Char = (unsigned char *)inUtf8Char;
- if(utf8Char[0]<0x80) return 1;
-
- if(utf8Char[0]>=0xC0 && utf8Char[0]<=0xFD) {
+ if (utf8Char[0] < 0x80)
+ return 1;
+
+ if (utf8Char[0] >= 0xC0 && utf8Char[0] <= 0xFD) {
int count = 1;
char t = 1 << 5;
int i;
- while(count < 6 && (t & utf8Char[0])) {
+ while (count < 6 && (t & utf8Char[0])) {
t = (t >> 1);
count++;
}
- if(count > 5) return 0;
- for(i=1;i<=count;i++) {
- if(utf8Char[i] < 0x80 || utf8Char[i] > 0xBF) return 0;
+ if (count > 5)
+ return 0;
+ for (i = 1; i <= count; i++) {
+ if (utf8Char[i] < 0x80 || utf8Char[i] > 0xBF)
+ return 0;
}
- return count+1;
- }
- else return 0;
+ return count + 1;
+ } else
+ return 0;
}
-int validUtf8String(char * string) {
+int validUtf8String(char *string)
+{
int ret;
- while(*string) {
+ while (*string) {
ret = validateUtf8Char(string);
- if(0==ret) return 0;
- string+= ret;
+ if (0 == ret)
+ return 0;
+ string += ret;
}
return 1;
}
-char * utf8StrToLatin1Dup(char * utf8) {
+char *utf8StrToLatin1Dup(char *utf8)
+{
/* utf8 should have at most two char's per latin1 char */
- int len = strlen(utf8)+1;
- char * ret = malloc(len);
- char * cp = ret;
+ int len = strlen(utf8) + 1;
+ char *ret = malloc(len);
+ char *cp = ret;
int count;
- memset(ret,0,len);
+ memset(ret, 0, len);
len = 0;
- while(*utf8) {
+ while (*utf8) {
count = validateUtf8Char(utf8);
- if(!count) {
+ if (!count) {
free(ret);
return NULL;
}
*(cp++) = utf8ToLatin1(utf8);
- utf8+= count;
+ utf8 += count;
len++;
}
- return realloc(ret,len+1);
+ return realloc(ret, len + 1);
}