Mercurial > freewnn

comparison Wnn/jserver/jbiki.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
183 } 183 }
184 184
185 maxlevel = max (maxlevel, len); 185 maxlevel = max (maxlevel, len);
186 if (j_e_p >= jmtw_end) 186 if (j_e_p >= jmtw_end)
187 return (-1); 187 return (-1);
188 j_e_p->kanji1 = p->kanjipter; //xxx is this an offset? may result in failure --yaz 188 j_e_p->kanji1 = p->kanjipter;
189 j_e_p->kanji2 = 0; 189 j_e_p->kanji2 = 0;
190 j_e_p->serial = p->serial; 190 j_e_p->serial = p->serial;
191 j_e_p->kosuu = p->kosuu; 191 j_e_p->kosuu = p->kosuu;
192 j_e_p->jishono = number; 192 j_e_p->jishono = number;
193 j_e_p->jptr = NULL; 193 j_e_p->jptr = NULL;
443 } 443 }
444 444
445 maxlevel = max (maxlevel, level + 1); 445 maxlevel = max (maxlevel, level + 1);
446 if (j_e_p >= jmtw_end) 446 if (j_e_p >= jmtw_end)
447 return (-1); 447 return (-1);
448 j_e_p->kanji1 = *(int *) (hopter + 8); //xxx what's? --yaz 448 j_e_p->kanji1 = *(int *) (hopter + 8);
449 j_e_p->kanji2 = sumst[index - 1]; 449 j_e_p->kanji2 = sumst[index - 1];
450 j_e_p->serial = serial = *(int *) (hopter + 4) + sumst[index - 1]; 450 j_e_p->serial = serial = *(int *) (hopter + 4) + sumst[index - 1];
451 j_e_p->kosuu = cnt; 451 j_e_p->kosuu = cnt;
452 j_e_p->jishono = number; 452 j_e_p->jishono = number;
453 j_e_p->jptr = NULL; 453 j_e_p->jptr = NULL;
605 else 605 else
606 { 606 {
607 *jepp = j_e_p; 607 *jepp = j_e_p;
608 if (j_e_p >= jmtw_end) 608 if (j_e_p >= jmtw_end)
609 return (-1); 609 return (-1);
610 j_e_p->kanji1 = p->kanjipter; //xxx this may result in failure --yaz 610 j_e_p->kanji1 = p->kanjipter;
611 j_e_p->kanji2 = 0; 611 j_e_p->kanji2 = 0;
612 j_e_p->serial = serial; 612 j_e_p->serial = serial;
613 j_e_p->kosuu = 1; 613 j_e_p->kosuu = 1;
614 j_e_p->jishono = number; 614 j_e_p->jishono = number;
615 j_e_p->jptr = NULL; 615 j_e_p->jptr = NULL;