Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings when compiling hunspell

Browse Source
This commit is contained in:
Kovid Goyal 2013-12-21 12:50:28 +05:30
parent da7ef93e27
commit 1ad7b5dca2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hunspell/affentry.hxx
View File

@ -27,7 +27,7 @@ public:
struct hentry * checkword(const char * word, int len, char in_compound, struct hentry * checkword(const char * word, int len, char in_compound,
const FLAG needflag = FLAG_NULL); const FLAG needflag = FLAG_NULL);
struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL);
char * check_morph(const char * word, int len, char in_compound, char * check_morph(const char * word, int len, char in_compound,
const FLAG needflag = FLAG_NULL); const FLAG needflag = FLAG_NULL);
@ -90,7 +90,7 @@ public:
// const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
char * check_twosfx_morph(const char * word, int len, int optflags, char * check_twosfx_morph(const char * word, int len, int optflags,
PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);

3
src/hunspell/affixmgr.cxx
View File

@ -3639,6 +3639,7 @@ int AffixMgr::parse_convtable(char * line, FileMgr * af, RepList ** rl, const c
/* now parse the num lines to read in the remainder of the table */ /* now parse the num lines to read in the remainder of the table */
char * nl; char * nl;
size_t keywordlen = strlen(keyword);
for (int j=0; j < numrl; j++) { for (int j=0; j < numrl; j++) {
if (!(nl = af->getline())) return 1; if (!(nl = af->getline())) return 1;
mychomp(nl); mychomp(nl);
@ -3651,7 +3652,7 @@ int AffixMgr::parse_convtable(char * line, FileMgr * af, RepList ** rl, const c
if (*piece != '\0') { if (*piece != '\0') {
switch(i) { switch(i) {
case 0: { case 0: {
if (strncmp(piece, keyword, sizeof(keyword)) != 0) { if (strncmp(piece, keyword, keywordlen) != 0) {
HUNSPELL_WARNING(stderr, "error: line %d: table is corrupt\n", af->getlinenum()); HUNSPELL_WARNING(stderr, "error: line %d: table is corrupt\n", af->getlinenum());
delete *rl; delete *rl;
*rl = NULL; *rl = NULL;