oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add and use com_err error codes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22556 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-02-01 16:38:46 +00:00
parent 3ff43c30b9
commit 3ad1f2d308
10 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/wind/utf8.c
View File

@@ -71,7 +71,7 @@ wind_utf8ucs4(const char *in, uint32_t *out, size_t *out_len)
u = ((c & 0x1F) << 6)
| (c2 & 0x3F);
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else if ((c & 0xF0) == 0xE0) {
const unsigned c2 = *++p;
@@ -82,10 +82,10 @@ wind_utf8ucs4(const char *in, uint32_t *out, size_t *out_len)
| ((c2 & 0x3F) << 6)
| (c3 & 0x3F);
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else if ((c & 0xF8) == 0xF0) {
const unsigned c2 = *++p;
@@ -99,23 +99,23 @@ wind_utf8ucs4(const char *in, uint32_t *out, size_t *out_len)
| ((c3 & 0x3F) << 6)
| (c4 & 0x3F);
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else {
return -1;
return WIND_ERR_INVALID_UTF8;
}
} else {
u = c;
}
if (out) {
if (o >= *out_len)
return -1;
return WIND_ERR_OVERRUN;
out[o++] = u;
}
}
@@ -178,13 +178,13 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len)
} else if (ch <= 0x10FFFF) {
len = 4;
} else
return -1;
return WIND_ERR_INVALID_UTF32;
o += len;
if (out) {
if (o >= *out_len)
return -1;
return WIND_ERR_OVERRUN;
switch(len) {
case 4:
@@ -204,7 +204,7 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len)
}
if (out) {
if (o + 1 >= *out_len)
return -1;
return WIND_ERR_OVERRUN;
*out = '\0';
}
*out_len = o;
@@ -246,7 +246,7 @@ _wind_ucs2read(void *ptr, size_t len, uint16_t *out)
int little = 1;
if (len & 1)
return -1;
return WIND_ERR_LENGTH_NOT_EVEN;
/* check for BOM */
while (len) {
@@ -296,7 +296,7 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len)
if (out) {
if (o >= *out_len)
return -1;
return WIND_ERR_OVERRUN;
switch(len) {
case 3:
@@ -313,7 +313,7 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len)
}
if (out) {
if (o + 1 >= *out_len)
return -1;
return WIND_ERR_OVERRUN;
*out = '\0';
}
*out_len = o;