This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository hunspell.
commit b131c65f46186175b19fe530e9b78cde1b9dc075 Author: Rene Engelhard <[email protected]> Date: Thu Apr 21 14:45:15 2016 +0200 Imported Upstream version 1.1.7 --- ChangeLog | 12 ++++++++++++ NEWS | 3 +++ configure | 20 ++++++++++---------- configure.ac | 4 ++-- src/hunspell/affixmgr.cxx | 14 +++++++------- src/hunspell/atypes.hxx | 4 +++- src/hunspell/csutil.cxx | 6 +++--- src/hunspell/hashmgr.cxx | 6 +++++- src/hunspell/hunspell.cxx | 12 ++++++++---- src/hunspell/suggestmgr.cxx | 2 -- 10 files changed, 53 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30dbe71..b4058ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-07-06 Németh László <nemeth at OOo>: + * atypes.cxx: warning-free swallowing of conditional warning messages + and their parameters using empty HUNSPELL_WARNING(a,b...) macro. + * {affixmgr,atypes,csutil}.cxx: fix unused variable warnings + using WARNVAR macro for conditionally named variables. + * hashmgr.cxx: fix unused variable warning in add_word() by cond. name + * hunspell.cxx: fix shadowed declaration of captype var. in suggest() + +2006-06-29 Caolan McNamara <cmc at OO.o>: + * hunspell.cxx: patch to fix possible memory leak in analyze() of + experimental morphological analyzer code. Sf.net Bug ID 1745263. + 2007-06-29 Németh László <nemeth at OOo>: improvements: * src/hunspell/hunspell.cxx: check bad capitalisation of Dutch letter IJ. diff --git a/NEWS b/NEWS index 611886f..9898c54 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +2007-07-06: Hunspell 1.1.7 release: + - fix warning messages of OpenOffice.org build + 2007-06-29: Hunspell 1.1.6 release: - check capitalization of the following word forms - words with mixed capitalisation: OpenOffice.org - OPENOFFICE.ORG diff --git a/configure b/configure index 6e3aabe..b747a19 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for hunspell 1.1.6. +# Generated by GNU Autoconf 2.59 for hunspell 1.1.7. # # Report bugs to <[email protected]>. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='hunspell' PACKAGE_TARNAME='hunspell' -PACKAGE_VERSION='1.1.6' -PACKAGE_STRING='hunspell 1.1.6' +PACKAGE_VERSION='1.1.7' +PACKAGE_STRING='hunspell 1.1.7' PACKAGE_BUGREPORT='[email protected]' ac_unique_file="config.h.in" @@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hunspell 1.1.6 to adapt to many kinds of systems. +\`configure' configures hunspell 1.1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hunspell 1.1.6:";; + short | recursive ) echo "Configuration of hunspell 1.1.7:";; esac cat <<\_ACEOF @@ -1171,7 +1171,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -hunspell configure 1.1.6 +hunspell configure 1.1.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1185,7 +1185,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hunspell $as_me 1.1.6, which was +It was created by hunspell $as_me 1.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1916,7 +1916,7 @@ fi # Define the identity of the package. PACKAGE=hunspell - VERSION=1.1.6 + VERSION=1.1.7 cat >>confdefs.h <<_ACEOF @@ -23886,7 +23886,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by hunspell $as_me 1.1.6, which was +This file was extended by hunspell $as_me 1.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23949,7 +23949,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -hunspell config.status 1.1.6 +hunspell config.status 1.1.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 6837c21..19afbcd 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ m4_pattern_allow AC_PREREQ(2.59) -AC_INIT([hunspell],[1.1.6],[[email protected]]) +AC_INIT([hunspell],[1.1.7],[[email protected]]) AC_CANONICAL_SYSTEM case "$host" in @@ -13,7 +13,7 @@ arm*) XFAILED="flagutf8.test maputf.test";; esac AC_SUBST(XFAILED) -AM_INIT_AUTOMAKE(hunspell, 1.1.6) +AM_INIT_AUTOMAKE(hunspell, 1.1.7) HUNSPELL_VERSION_MAJOR=`echo $VERSION | cut -d"." -f1` HUNSPELL_VERSION_MINOR=`echo $VERSION | cut -d"." -f2` AC_SUBST(HUNSPELL_VERSION_MAJOR) diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx index f89ca23..e18788f 100644 --- a/src/hunspell/affixmgr.cxx +++ b/src/hunspell/affixmgr.cxx @@ -3883,7 +3883,7 @@ int AffixMgr::parse_affix(char * line, const char at, FILE * af, char * dupflag return 0; } -int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char * cond, char * line) { +int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char * cond, char * WARNVAR) { int condl = strlen(cond); int i; int j; @@ -3896,7 +3896,7 @@ int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char for (i = 0, j = 0; (i < stripl) && (j < condl); i++, j++) { if (cond[j] != '[') { if (cond[j] != strip[i]) { - HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", warnvar); } } else { neg = (cond[j+1] == '^') ? 1 : 0; @@ -3906,11 +3906,11 @@ int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char if (strip[i] == cond[j]) in = 1; } while ((j < (condl - 1)) && (cond[j] != ']')); if (j == (condl - 1) && (cond[j] != ']')) { - HUNSPELL_WARNING(stderr, "error: missing ] in condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "error: missing ] in condition:\n%s\n", warnvar); return 0; } if ((!neg && !in) || (neg && in)) { - HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", warnvar); return 0; } } @@ -3924,7 +3924,7 @@ int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char for (i = stripl - 1, j = condl - 1; (i >= 0) && (j >= 0); i--, j--) { if (cond[j] != ']') { if (cond[j] != strip[i]) { - HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", warnvar); } } else { in = 0; @@ -3933,12 +3933,12 @@ int AffixMgr::redundant_condition(char ft, char * strip, int stripl, const char if (strip[i] == cond[j]) in = 1; } while ((j > 0) && (cond[j] != '[')); if ((j == 0) && (cond[j] != '[')) { - HUNSPELL_WARNING(stderr, "error: missing ] in condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "error: missing ] in condition:\n%s\n", warnvar); return 0; } neg = (cond[j+1] == '^') ? 1 : 0; if ((!neg && !in) || (neg && in)) { - HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", line); + HUNSPELL_WARNING(stderr, "warning: incompatible stripping characters and condition:\n%s\n", warnvar); return 0; } } diff --git a/src/hunspell/atypes.hxx b/src/hunspell/atypes.hxx index 4f6c1ea..c636b85 100644 --- a/src/hunspell/atypes.hxx +++ b/src/hunspell/atypes.hxx @@ -4,8 +4,10 @@ #ifndef HUNSPELL_WARNING #ifdef HUNSPELL_WARNING_ON #define HUNSPELL_WARNING fprintf +#define WARNVAR warnvar #else -#define HUNSPELL_WARNING +#define HUNSPELL_WARNING(a,b...) +#define WARNVAR #endif #endif diff --git a/src/hunspell/csutil.cxx b/src/hunspell/csutil.cxx index 4e041e5..673f2d1 100644 --- a/src/hunspell/csutil.cxx +++ b/src/hunspell/csutil.cxx @@ -5291,14 +5291,14 @@ void remove_ignored_chars(char * word, char * ignored_chars) *word = '\0'; } -int parse_string(char * line, char ** out, const char * name) +int parse_string(char * line, char ** out, const char * WARNVAR) { char * tp = line; char * piece; int i = 0; int np = 0; if (*out) { - HUNSPELL_WARNING(stderr, "error: duplicate %s line\n", name); + HUNSPELL_WARNING(stderr, "error: duplicate %s line\n", warnvar); return 1; } piece = mystrsep(&tp, 0); @@ -5319,7 +5319,7 @@ int parse_string(char * line, char ** out, const char * name) piece = mystrsep(&tp, 0); } if (np != 2) { - HUNSPELL_WARNING(stderr, "error: missing %s information\n", name); + HUNSPELL_WARNING(stderr, "error: missing %s information\n", warnvar); return 1; } return 0; diff --git a/src/hunspell/hashmgr.cxx b/src/hunspell/hashmgr.cxx index 1ca23d8..5cdb543 100644 --- a/src/hunspell/hashmgr.cxx +++ b/src/hunspell/hashmgr.cxx @@ -132,7 +132,11 @@ struct hentry * HashMgr::lookup(const char *word) const // add a word to the hash table (private) int HashMgr::add_word(const char * word, int wl, unsigned short * aff, - int al, const char * desc, bool onlyupcase) + int al, const char * +#ifdef HUNSPELL_EXPERIMENTAL +desc +#endif +, bool onlyupcase) { char * st = mystrdup(word); bool upcasehomonym = false; diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx index bd03b53..800473e 100644 --- a/src/hunspell/hunspell.cxx +++ b/src/hunspell/hunspell.cxx @@ -79,7 +79,6 @@ int Hunspell::cleanword2(char * dest, const char * src, { unsigned char * p = (unsigned char *) dest; const unsigned char * q = (const unsigned char * ) src; - int firstcap = 0; // first skip over any leading blanks while ((*q != '\0') && (*q == ' ')) q++; @@ -708,9 +707,9 @@ int Hunspell::suggest(char*** slst, const char * word) // something.The -> something. The char * dot = strchr(cw, '.'); if (dot && (dot > cw)) { - int captype = utf8 ? get_captype_utf8(dot+1, strlen(dot+1), langnum) : + int captype_ = utf8 ? get_captype_utf8(dot+1, strlen(dot+1), langnum) : get_captype(dot+1, strlen(dot+1), csconv); - if (captype == INITCAP) { + if (captype_ == INITCAP) { char * st = mystrdup(cw); st = (char *) realloc(st, wl + 1); st[(dot - cw) + 1] = ' '; @@ -1699,7 +1698,12 @@ int Hunspell::analyze(char ***out, const char *word) { if (!word) return 0; char * m = morph(word); if(!m) return 0; - if (!out) return line_tok(m, out); + if (!out) + { + n = line_tok(m, out); + free(m); + return n; + } // without memory allocation /* BUG missing buffer size checking */ diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx index 41cc6cf..d972d79 100644 --- a/src/hunspell/suggestmgr.cxx +++ b/src/hunspell/suggestmgr.cxx @@ -449,7 +449,6 @@ int SuggestMgr::doubletwochars(char** wlst, const char * word, int ns, int cpdsu // perhaps we doubled two characters (pattern aba -> ababa, for example vacation -> vacacation) int SuggestMgr::doubletwochars_utf(char ** wlst, const w_char * word, int wl, int ns, int cpdsuggest) { - w_char tmpc; w_char candidate_utf[MAXSWL]; char candidate[MAXSWUTF8L]; int state=0; @@ -567,7 +566,6 @@ int SuggestMgr::forgotchar(char ** wlst, const char * word, int ns, int cpdsugge char candidate[MAXSWUTF8L]; const char * p; char * q; - int cwrd; time_t timelimit = time(NULL); int timer = MINTIMER; int wl = strlen(word); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hunspell.git
