1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
--- a/src/ispell/ispell_checker.cpp Thu Apr 1 13:53:37 2010
+++ b/src/ispell/ispell_checker.cpp Mon Feb 24 15:35:49 2014
@@ -162,7 +162,7 @@
else
{
/* convert to 8bit string and null terminate */
- size_t len_in, len_out, result;
+ gsize len_in, len_out, result;
// the 8bit encodings use precomposed forms
char *normalizedWord = g_utf8_normalize (utf8Word, length, G_NORMALIZE_NFC);
char *In = normalizedWord;
@@ -172,7 +172,7 @@
len_out = sizeof( szWord ) - 1;
result = g_iconv(m_translate_in, &In, &len_in, &Out, &len_out);
g_free(normalizedWord);
- if ((size_t)-1 == result)
+ if ((gsize)-1 == result)
return false;
*Out = '\0';
}
@@ -210,7 +210,7 @@
{
/* convert to 8bit string and null terminate */
- size_t len_in, len_out, result;
+ gsize len_in, len_out, result;
// the 8bit encodings use precomposed forms
char *normalizedWord = g_utf8_normalize (utf8Word, length, G_NORMALIZE_NFC);
char *In = normalizedWord;
@@ -219,7 +219,7 @@
len_out = sizeof( word8 ) - 1;
result = g_iconv(m_translate_in, &In, &len_in, &Out, &len_out);
g_free(normalizedWord);
- if ((size_t)-1 == result)
+ if ((gsize)-1 == result)
return NULL;
*Out = '\0';
}
@@ -252,13 +252,13 @@
{
/* convert to 32bit string and null terminate */
- size_t len_in, len_out;
+ gsize len_in, len_out;
char *In = m_possibilities[c];
char *Out = reinterpret_cast<char *>(utf8Sugg);
len_in = l;
len_out = INPUTWORDLEN + MAXAFFIXLEN;
- if ((size_t)-1 == g_iconv(m_translate_out, &In, &len_in, &Out, &len_out)) {
+ if ((gsize)-1 == g_iconv(m_translate_out, &In, &len_in, &Out, &len_out)) {
*out_n_suggestions = c;
return sugg_arr;
}
--- a/src/myspell/myspell_checker.cpp Thu Apr 1 13:53:37 2010
+++ b/src/myspell/myspell_checker.cpp Mon Feb 24 15:37:56 2014
@@ -159,11 +159,11 @@
char *in = normalizedWord;
char word8[MAXWORDLEN + 1];
char *out = word8;
- size_t len_in = strlen(in);
- size_t len_out = sizeof( word8 ) - 1;
- size_t result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out);
+ gsize len_in = strlen(in);
+ gsize len_out = sizeof( word8 ) - 1;
+ gsize result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out);
g_free(normalizedWord);
- if ((size_t)-1 == result)
+ if ((gsize)-1 == result)
return false;
*out = '\0';
if (myspell->spell(word8))
@@ -185,11 +185,11 @@
char *in = normalizedWord;
char word8[MAXWORDLEN + 1];
char *out = word8;
- size_t len_in = strlen(in);
- size_t len_out = sizeof(word8) - 1;
- size_t result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out);
+ gsize len_in = strlen(in);
+ gsize len_out = sizeof(word8) - 1;
+ gsize result = g_iconv(m_translate_in, &in, &len_in, &out, &len_out);
g_free(normalizedWord);
- if ((size_t)-1 == result)
+ if ((gsize)-1 == result)
return NULL;
*out = '\0';
@@ -203,7 +203,7 @@
len_out = MAXWORDLEN;
char *word = g_new0(char, len_out + 1);
out = reinterpret_cast<char *>(word);
- if ((size_t)-1 == g_iconv(m_translate_out, &in, &len_in, &out, &len_out)) {
+ if ((gsize)-1 == g_iconv(m_translate_out, &in, &len_in, &out, &len_out)) {
for (size_t j = i; j < *nsug; j++)
free(sugMS[j]);
free(sugMS);
|
