Mercurial > freewnn
comparison Wnn/jserver/rd_jishoop.c @ 1:790205f476c0
applied wnn_dec12.diff
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Thu, 13 Dec 2007 04:47:24 +0900 |
parents | bbc77ca4def5 |
children | ed4bb01eb317 |
comparison
equal
deleted
inserted
replaced
0:bbc77ca4def5 | 1:790205f476c0 |
---|---|
84 Sreverse (kanji, pkanji); | 84 Sreverse (kanji, pkanji); |
85 # endif /* CONVERT_from_TOP */ | 85 # endif /* CONVERT_from_TOP */ |
86 #endif /* CONVERT_with_SiSheng */ | 86 #endif /* CONVERT_with_SiSheng */ |
87 | 87 |
88 if ((jtl->bufsize_kanji <= jtl->maxkanji + (Strlen (kanji) + Strlen (comment) + Strlen (yomi) + 3) * sizeof (w_char) + 1) | 88 if ((jtl->bufsize_kanji <= jtl->maxkanji + (Strlen (kanji) + Strlen (comment) + Strlen (yomi) + 3) * sizeof (w_char) + 1) |
89 && (ud_realloc_kanji (jtl) == NULL)) | 89 && (ud_realloc_kanji (jtl) == 0)) |
90 { | 90 { |
91 return (-1); | 91 return (-1); |
92 } | 92 } |
93 if (jtl->bufsize_ri1[D_YOMI] <= jtl->maxri1[D_YOMI] + 2 | 93 if (jtl->bufsize_ri1[D_YOMI] <= jtl->maxri1[D_YOMI] + 2 |
94 && rd_realloc_ri1 (jtl, D_YOMI) == NULL) | 94 && rd_realloc_ri1 (jtl, D_YOMI) == 0) |
95 { | 95 { |
96 return (-1); | 96 return (-1); |
97 } | 97 } |
98 if (jtl->bufsize_ri1[D_KANJI] <= jtl->maxri1[D_KANJI] + 2 | 98 if (jtl->bufsize_ri1[D_KANJI] <= jtl->maxri1[D_KANJI] + 2 |
99 && rd_realloc_ri1 (jtl, D_KANJI) == NULL) | 99 && rd_realloc_ri1 (jtl, D_KANJI) == 0) |
100 { | 100 { |
101 return (-1); | 101 return (-1); |
102 } | 102 } |
103 if (jtl->bufsize_serial <= jtl->maxserial + 4 | 103 if (jtl->bufsize_serial <= jtl->maxserial + 4 |
104 && ud_realloc_serial (jtl) == NULL) | 104 && ud_realloc_serial (jtl) == 0) |
105 { | 105 { |
106 return (-1); | 106 return (-1); |
107 } | 107 } |
108 | 108 |
109 ri2 = jtl->ri2; | 109 ri2 = jtl->ri2; |
287 return (-1); | 287 return (-1); |
288 | 288 |
289 p = jtl->ri2 + serial; | 289 p = jtl->ri2 + serial; |
290 get_kanji_str (jtl->kanji + p->kanjipter, NULL, yomi, NULL); | 290 get_kanji_str (jtl->kanji + p->kanjipter, NULL, yomi, NULL); |
291 | 291 |
292 jd->kanji1 = p->kanjipter; | 292 jd->kanji1 = (UCHAR *)p->kanjipter; |
293 jd->kanji2 = 0; | 293 jd->kanji2 = 0; |
294 jd->serial = serial; | 294 jd->serial = serial; |
295 jd->kosuu = 1; | 295 jd->kosuu = 1; |
296 jd->jishono = dic_no; | 296 jd->jishono = dic_no; |
297 jd->jptr = NULL; | 297 jd->jptr = NULL; |