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 assert in ZOOM when http connect fails YAZ-757
[yaz-moved-to-github.git]
/
src
/
icu_casemap.c
diff --git
a/src/icu_casemap.c
b/src/icu_casemap.c
index
f75381e
..
a636f92
100644
(file)
--- a/
src/icu_casemap.c
+++ b/
src/icu_casemap.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-30,22
+30,22
@@
struct icu_casemap
char action;
};
char action;
};
-struct icu_casemap * icu_casemap_create(char action, UErrorCode *status)
-{
- struct icu_casemap * casemap
+struct icu_casemap *icu_casemap_create(char action, UErrorCode *status)
+{
+ struct icu_casemap *casemap
= (struct icu_casemap *) xmalloc(sizeof(struct icu_casemap));
casemap->action = action;
switch (casemap->action)
{
= (struct icu_casemap *) xmalloc(sizeof(struct icu_casemap));
casemap->action = action;
switch (casemap->action)
{
- case 'l':
- case 'L':
- case 'u':
- case 'U':
- case 't':
- case 'T':
- case 'f':
- case 'F':
+ case 'l':
+ case 'L':
+ case 'u':
+ case 'U':
+ case 't':
+ case 'T':
+ case 'f':
+ case 'F':
break;
default:
icu_casemap_destroy(casemap);
break;
default:
icu_casemap_destroy(casemap);
@@
-67,46
+67,46
@@
void icu_casemap_destroy(struct icu_casemap * casemap)
xfree(casemap);
}
xfree(casemap);
}
-int icu_casemap_casemap(struct icu_casemap * casemap,
- struct icu_buf_utf16 * dest16,
- struct icu_buf_utf16 * src16,
+int icu_casemap_casemap(struct icu_casemap *casemap,
+ struct icu_buf_utf16 *dest16,
+ struct icu_buf_utf16 *src16,
UErrorCode *status,
const char *locale)
{
UErrorCode *status,
const char *locale)
{
- if(!casemap)
+ if (!casemap)
return 0;
return 0;
-
+
return icu_utf16_casemap(dest16, src16, locale,
casemap->action, status);
}
return icu_utf16_casemap(dest16, src16, locale,
casemap->action, status);
}
-static uint32_t icu_utf16_sub(struct icu_buf_utf16 * dest16,
- struct icu_buf_utf16 * src16,
+static uint32_t icu_utf16_sub(struct icu_buf_utf16 *dest16,
+ struct icu_buf_utf16 *src16,
const char *locale, char action,
UErrorCode *status)
{
switch (action)
{
const char *locale, char action,
UErrorCode *status)
{
switch (action)
{
- case 'l':
- case 'L':
+ case 'l':
+ case 'L':
return u_strToLower(dest16->utf16, dest16->utf16_cap,
return u_strToLower(dest16->utf16, dest16->utf16_cap,
- src16->utf16, src16->utf16_len,
+ src16->utf16, src16->utf16_len,
locale, status);
locale, status);
- case 'u':
- case 'U':
+ case 'u':
+ case 'U':
return u_strToUpper(dest16->utf16, dest16->utf16_cap,
return u_strToUpper(dest16->utf16, dest16->utf16_cap,
- src16->utf16, src16->utf16_len,
+ src16->utf16, src16->utf16_len,
locale, status);
break;
locale, status);
break;
- case 't':
- case 'T':
+ case 't':
+ case 'T':
return u_strToTitle(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
0, locale, status);
break;
return u_strToTitle(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
0, locale, status);
break;
- case 'f':
- case 'F':
+ case 'f':
+ case 'F':
return u_strFoldCase(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
U_FOLD_CASE_DEFAULT, status);
return u_strFoldCase(dest16->utf16, dest16->utf16_cap,
src16->utf16, src16->utf16_len,
U_FOLD_CASE_DEFAULT, status);
@@
-119,8
+119,8
@@
static uint32_t icu_utf16_sub(struct icu_buf_utf16 * dest16,
}
}
-int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
- struct icu_buf_utf16 * src16,
+int icu_utf16_casemap(struct icu_buf_utf16 *dest16,
+ struct icu_buf_utf16 *src16,
const char *locale, char action,
UErrorCode *status)
{
const char *locale, char action,
UErrorCode *status)
{
@@
-133,7
+133,7
@@
int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
dest16->utf16_len = 0;
return U_ZERO_ERROR;
}
dest16->utf16_len = 0;
return U_ZERO_ERROR;
}
-
+
dest16_len = icu_utf16_sub(dest16, src16, locale, action, status);
/* check for buffer overflow, resize and retry */
dest16_len = icu_utf16_sub(dest16, src16, locale, action, status);
/* check for buffer overflow, resize and retry */
@@
-154,7
+154,7
@@
int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
dest16->utf16[0] = (UChar) 0;
dest16->utf16_len = 0;
}
dest16->utf16[0] = (UChar) 0;
dest16->utf16_len = 0;
}
-
+
return *status;
}
return *status;
}