projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problem with HTTP decoding
[yaz-moved-to-github.git]
/
src
/
icu_utf8.c
diff --git
a/src/icu_utf8.c
b/src/icu_utf8.c
index
a6fcda8
..
ee670a1
100644
(file)
--- a/
src/icu_utf8.c
+++ b/
src/icu_utf8.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-28,23
+28,22
@@
struct icu_buf_utf8 *icu_buf_utf8_create(size_t capacity)
{
struct icu_buf_utf8 *icu_buf_utf8_create(size_t capacity)
{
- struct icu_buf_utf8 * buf8
+ struct icu_buf_utf8 *buf8
= (struct icu_buf_utf8 *) xmalloc(sizeof(struct icu_buf_utf8));
= (struct icu_buf_utf8 *) xmalloc(sizeof(struct icu_buf_utf8));
- buf8->utf8 = 0;
buf8->utf8_len = 0;
buf8->utf8_len = 0;
- buf8->utf8_cap = 0;
-
+ buf8->utf8_cap = capacity;
if (capacity > 0)
{
buf8->utf8 = (uint8_t *) xmalloc(sizeof(uint8_t) * capacity);
buf8->utf8[0] = (uint8_t) 0;
if (capacity > 0)
{
buf8->utf8 = (uint8_t *) xmalloc(sizeof(uint8_t) * capacity);
buf8->utf8[0] = (uint8_t) 0;
- buf8->utf8_cap = capacity;
}
}
+ else
+ buf8->utf8 = 0;
return buf8;
}
return buf8;
}
-struct icu_buf_utf8 * icu_buf_utf8_clear(struct icu_buf_utf8 * buf8)
+struct icu_buf_utf8 *icu_buf_utf8_clear(struct icu_buf_utf8 *buf8)
{
if (buf8)
{
{
if (buf8)
{
@@
-55,8
+54,8
@@
struct icu_buf_utf8 * icu_buf_utf8_clear(struct icu_buf_utf8 * buf8)
return buf8;
}
return buf8;
}
-struct icu_buf_utf8 * icu_buf_utf8_resize(struct icu_buf_utf8 * buf8,
- size_t capacity)
+struct icu_buf_utf8 *icu_buf_utf8_resize(struct icu_buf_utf8 *buf8,
+ size_t capacity)
{
if (!buf8)
return 0;
{
if (!buf8)
return 0;
@@
-75,7
+74,6
@@
struct icu_buf_utf8 * icu_buf_utf8_resize(struct icu_buf_utf8 * buf8,
{
xfree(buf8->utf8);
buf8->utf8 = 0;
{
xfree(buf8->utf8);
buf8->utf8 = 0;
- buf8->utf8_len = 0;
buf8->utf8_cap = 0;
}
buf8->utf8_cap = 0;
}
@@
-95,16
+93,16
@@
const char *icu_buf_utf8_to_cstr(struct icu_buf_utf8 *src8)
return (const char *) src8->utf8;
}
return (const char *) src8->utf8;
}
-void icu_buf_utf8_destroy(struct icu_buf_utf8 * buf8)
+void icu_buf_utf8_destroy(struct icu_buf_utf8 *buf8)
{
if (buf8)
xfree(buf8->utf8);
xfree(buf8);
}
{
if (buf8)
xfree(buf8->utf8);
xfree(buf8);
}
-UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
- const char * src8cstr,
- UErrorCode * status)
+UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 *dest16,
+ const char *src8cstr,
+ UErrorCode *status)
{
size_t src8cstr_len = 0;
int32_t utf16_len = 0;
{
size_t src8cstr_len = 0;
int32_t utf16_len = 0;
@@
-136,7
+134,7
@@
UErrorCode icu_utf16_from_utf8_cstr(struct icu_buf_utf16 * dest16,
UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 *dest8,
const struct icu_buf_utf16 *src16,
UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 *dest8,
const struct icu_buf_utf16 *src16,
- UErrorCode * status)
+ UErrorCode *status)
{
int32_t utf8_len = 0;
{
int32_t utf8_len = 0;