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
Refactor yaz_match-routines to separate source
[yaz-moved-to-github.git]
/
src
/
icu_utf16.c
diff --git
a/src/icu_utf16.c
b/src/icu_utf16.c
index
5bb74ec
..
894c97d
100644
(file)
--- a/
src/icu_utf16.c
+++ b/
src/icu_utf16.c
@@
-32,36
+32,31
@@
struct icu_buf_utf16 *icu_buf_utf16_create(size_t capacity)
struct icu_buf_utf16 *buf16
= (struct icu_buf_utf16 *) xmalloc(sizeof(struct icu_buf_utf16));
struct icu_buf_utf16 *buf16
= (struct icu_buf_utf16 *) xmalloc(sizeof(struct icu_buf_utf16));
- buf16->utf16 = 0;
buf16->utf16_len = 0;
buf16->utf16_len = 0;
- buf16->utf16_cap = 0;
-
+ buf16->utf16_cap = capacity;
if (capacity > 0)
{
buf16->utf16 = (UChar *) xmalloc(sizeof(UChar) * capacity);
buf16->utf16[0] = (UChar) 0;
if (capacity > 0)
{
buf16->utf16 = (UChar *) xmalloc(sizeof(UChar) * capacity);
buf16->utf16[0] = (UChar) 0;
- buf16->utf16_cap = capacity;
}
}
+ else
+ buf16->utf16 = 0;
return buf16;
}
struct icu_buf_utf16 *icu_buf_utf16_clear(struct icu_buf_utf16 *buf16)
{
return buf16;
}
struct icu_buf_utf16 *icu_buf_utf16_clear(struct icu_buf_utf16 *buf16)
{
- if (buf16)
- {
- if (buf16->utf16)
- buf16->utf16[0] = (UChar) 0;
- buf16->utf16_len = 0;
- }
+ assert(buf16);
+ if (buf16->utf16)
+ buf16->utf16[0] = (UChar) 0;
+ buf16->utf16_len = 0;
return buf16;
}
struct icu_buf_utf16 *icu_buf_utf16_resize(struct icu_buf_utf16 *buf16,
size_t capacity)
{
return buf16;
}
struct icu_buf_utf16 *icu_buf_utf16_resize(struct icu_buf_utf16 *buf16,
size_t capacity)
{
- if (!buf16)
- return 0;
-
+ assert(buf16);
if (capacity > 0)
{
if (0 == buf16->utf16)
if (capacity > 0)
{
if (0 == buf16->utf16)
@@
-69,14
+64,8
@@
struct icu_buf_utf16 *icu_buf_utf16_resize(struct icu_buf_utf16 *buf16,
else
buf16->utf16
= (UChar *) xrealloc(buf16->utf16, sizeof(UChar) * capacity);
else
buf16->utf16
= (UChar *) xrealloc(buf16->utf16, sizeof(UChar) * capacity);
+ buf16->utf16_cap = capacity;
}
}
- else
- {
- xfree(buf16->utf16);
- buf16->utf16 = 0;
- buf16->utf16_len = 0;
- }
- buf16->utf16_cap = capacity;
return buf16;
}
return buf16;
}