Mercurial > freewnn

comparison Wnn/jserver/jishosub.c @ 27:6bfa7ea3b75b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- resolved conflict between pointer and int - more warning suppression
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Sat, 06 Mar 2010 18:29:27 +0900
parents ed4bb01eb317
children
comparison
equal deleted inserted replaced
26:6dcfbd28e807 27:6bfa7ea3b75b
137 int *ptrst; 137 int *ptrst;
138 int state; 138 int state;
139 int sdiff; 139 int sdiff;
140 int last; 140 int last;
141 int serialst; 141 int serialst;
142 UCHAR *kanji1; 142 int kanji1;
143 143
144 144
145 yomi[0] = 0; 145 yomi[0] = 0;
146 jtl = (struct JT *) (files[dic_table[dic_no].body].area); 146 jtl = (struct JT *) (files[dic_table[dic_no].body].area);
147 if (dic_table[dic_no].hindo >= 0) 147 if (dic_table[dic_no].hindo >= 0)
164 { 164 {
165 case ST_NORMAL: 165 case ST_NORMAL:
166 case ST_NOPTER: 166 case ST_NOPTER:
167 tsize = *(w_char *) (hopter + 2); 167 tsize = *(w_char *) (hopter + 2);
168 serialst = *(int *) (hopter + 4); 168 serialst = *(int *) (hopter + 4);
169 kanji1 = (UCHAR *) (hopter + 8); 169 kanji1 = *(int *) (hopter + 8);
170 charst = (w_char *) (hopter + 12); 170 charst = (w_char *) (hopter + 12);
171 sumst = ((w_char *) charst + tsize + 2); 171 sumst = ((w_char *) charst + tsize + 2);
172 /* + 2 keeps two zero words */ 172 /* + 2 keeps two zero words */
173 ptrst = (int *) ((w_char *) sumst + tsize); 173 ptrst = (int *) ((w_char *) sumst + tsize);
174 sdiff = serial - *(int *) (hopter + 4); 174 sdiff = serial - *(int *) (hopter + 4);
185 } 185 }
186 len = Strlen (yomi); 186 len = Strlen (yomi);
187 yomi[len] = charst[key]; 187 yomi[len] = charst[key];
188 yomi[len + 1] = 0; 188 yomi[len + 1] = 0;
189 189
190 jd->kanji1 = (int)kanji1; // xxx this may result in failure --yaz 190 jd->kanji1 = kanji1;
191 jd->kanji2 = serial - serialst; 191 jd->kanji2 = serial - serialst;
192 jd->serial = serial; 192 jd->serial = serial;
193 jd->kosuu = 1; 193 jd->kosuu = 1;
194 jd->jishono = dic_no; 194 jd->jishono = dic_no;
195 jd->jptr = NULL; 195 jd->jptr = NULL;
351 } 351 }
352 len = p->yomi[0]; 352 len = p->yomi[0];
353 Strncpy (yomi + 4, (p->yomi) + 1, len - 4); 353 Strncpy (yomi + 4, (p->yomi) + 1, len - 4);
354 yomi[len] = 0; 354 yomi[len] = 0;
355 355
356 jd->kanji1 = p->kanjipter; // xxx this may result in failure --yaz 356 jd->kanji1 = p->kanjipter;
357 jd->kanji2 = serial - p->serial; 357 jd->kanji2 = serial - p->serial;
358 jd->serial = serial; 358 jd->serial = serial;
359 jd->kosuu = 1; 359 jd->kosuu = 1;
360 jd->jishono = dic_no; 360 jd->jishono = dic_no;
361 jd->jptr = NULL; 361 jd->jptr = NULL;