Hello community, here is the log from the commit of package hyphen for openSUSE:Factory checked in at 2015-01-22 21:48:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyphen (Old) and /work/SRC/openSUSE:Factory/.hyphen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hyphen" Changes: -------- --- /work/SRC/openSUSE:Factory/hyphen/hyphen.changes 2014-05-02 13:53:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hyphen.new/hyphen.changes 2015-01-22 21:48:35.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 30 17:06:42 UTC 2014 - [email protected] + +- Update to version 2.8.8 + + remove last coverity warning, 0 remaining +- Changes from version 2.8.7 + + various clang scan-build warning fixes + +------------------------------------------------------------------- Old: ---- hyphen-2.8.6.tar.gz New: ---- hyphen-2.8.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyphen.spec ++++++ --- /var/tmp/diff_new_pack.1p0NS8/_old 2015-01-22 21:48:36.000000000 +0100 +++ /var/tmp/diff_new_pack.1p0NS8/_new 2015-01-22 21:48:36.000000000 +0100 @@ -18,7 +18,7 @@ %define libname libhyphen0 Name: hyphen -Version: 2.8.6 +Version: 2.8.8 Release: 0 Summary: A text hyphenation library License: GPL-2.0+ or LGPL-2.0+ or MPL-1.1+ ++++++ hyphen-2.8.6.tar.gz -> hyphen-2.8.8.tar.gz ++++++ ++++ 2863 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/ChangeLog new/hyphen-2.8.8/ChangeLog --- old/hyphen-2.8.6/ChangeLog 2012-09-13 09:50:32.000000000 +0200 +++ new/hyphen-2.8.8/ChangeLog 2014-09-18 17:41:58.000000000 +0200 @@ -1,3 +1,19 @@ +2014-09-18 Caolán McNamara <caolán at redhat dot com>: + * coverity#58283 now 0 coverity warnings + +2014-06-30 Rene Engelhard <rene at rene - engelhard dot de>: + * add missing stdio.h to hyphen.h, reported by David Suárez + in deb#753218. + +2014-06-26 Caolán McNamara <caolán at redhat dot com>: + * clang scan-build warnings + +2013-03-18 László Németh <nemeth at numbertext dot org>: + * Makefile.am, Makefile.in: set -version-info + +2013-03-12 Paweł Hajdan <phajdan at google>: + * hyphen.h, hyphen.c: add hnj_hyphen_load_file() for sandboxing + 2012-09-13 László Németh <nemeth at numbertext dot org>: * hyphen.c: fdo#43931: removing hard hyphen hyphenation for LibreOffice diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/Makefile.am new/hyphen-2.8.8/Makefile.am --- old/hyphen-2.8.6/Makefile.am 2012-06-29 09:10:56.000000000 +0200 +++ new/hyphen-2.8.8/Makefile.am 2013-03-18 11:49:03.000000000 +0100 @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libhyphen.la libhyphen_la_SOURCES = hnjalloc.c hyphen.c -libhyphen_la_LDFLAGS = -version-info 2:1:2 +libhyphen_la_LDFLAGS = -version-info 3:0:3 include_HEADERS = hyphen.h noinst_HEADERS = hnjalloc.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/NEWS new/hyphen-2.8.8/NEWS --- old/hyphen-2.8.6/NEWS 2012-09-13 09:36:04.000000000 +0200 +++ new/hyphen-2.8.8/NEWS 2014-09-18 17:43:44.000000000 +0200 @@ -1,3 +1,9 @@ +2014-09-18 Hyphen 2.8.8: + - remove last coverity warning, 0 remaining + +2014-06-27 Hyphen 2.8.7: + - various clang scan-build warning fixes + 2012-09-13 Hyphen 2.8.6: - righthyphenmin fix for 3-byte or more UTF-8 multibyte characters by Steven Dickson diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/configure.in new/hyphen-2.8.8/configure.in --- old/hyphen-2.8.6/configure.in 2012-09-13 11:32:23.000000000 +0200 +++ new/hyphen-2.8.8/configure.in 2014-09-18 17:43:59.000000000 +0200 @@ -1,5 +1,5 @@ -AC_INIT([hyphen],[2.8.6],[[email protected]]) -AM_INIT_AUTOMAKE(hyphen,2.8.6) +AC_INIT([hyphen],[2.8.8],[[email protected]]) +AM_INIT_AUTOMAKE(hyphen,2.8.8) AC_PROG_CC AC_PROG_INSTALL AC_PROG_LIBTOOL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/hyphen.c new/hyphen-2.8.8/hyphen.c --- old/hyphen-2.8.6/hyphen.c 2012-09-12 11:00:28.000000000 +0200 +++ new/hyphen-2.8.8/hyphen.c 2014-06-26 15:42:28.000000000 +0200 @@ -64,14 +64,14 @@ static char * hnj_strdup (const char *s) { - char *new; + char *newstr; int l; l = strlen (s); - new = hnj_malloc (l + 1); - memcpy (new, s, l); - new[l] = 0; - return new; + newstr = (char *) hnj_malloc (l + 1); + memcpy (newstr, s, l); + newstr[l] = 0; + return newstr; } /* remove cross-platform text line end characters */ @@ -123,7 +123,7 @@ HashTab *hashtab; int i; - hashtab = hnj_malloc (sizeof(HashTab)); + hashtab = (HashTab *) hnj_malloc (sizeof(HashTab)); for (i = 0; i < HASH_SIZE; i++) hashtab->entries[i] = NULL; @@ -155,7 +155,7 @@ HashEntry *e; i = hnj_string_hash (key) % HASH_SIZE; - e = hnj_malloc (sizeof(HashEntry)); + e = (HashEntry *) hnj_malloc (sizeof(HashEntry)); e->next = hashtab->entries[i]; e->key = hnj_strdup (key); e->val = val; @@ -190,7 +190,7 @@ /* predicate is true if dict->num_states is a power of two */ if (!(dict->num_states & (dict->num_states - 1))) { - dict->states = hnj_realloc (dict->states, + dict->states = (HyphenState *) hnj_realloc (dict->states, (dict->num_states << 1) * sizeof(HyphenState)); } @@ -212,11 +212,11 @@ num_trans = dict->states[state1].num_trans; if (num_trans == 0) { - dict->states[state1].trans = hnj_malloc (sizeof(HyphenTrans)); + dict->states[state1].trans = (HyphenTrans *) hnj_malloc (sizeof(HyphenTrans)); } else if (!(num_trans & (num_trans - 1))) { - dict->states[state1].trans = hnj_realloc (dict->states[state1].trans, + dict->states[state1].trans = (HyphenTrans *) hnj_realloc (dict->states[state1].trans, (num_trans << 1) * sizeof(HyphenTrans)); } @@ -360,7 +360,7 @@ } /* now, put in the prefix transitions */ - for (; found < 0 ;j--) + for (; found < 0 && j > 0; --j) { last_state = state_num; ch = word[j - 1]; @@ -374,19 +374,28 @@ HyphenDict * hnj_hyphen_load (const char *fn) { + HyphenDict *result; + FILE *f; + f = fopen (fn, "r"); + if (f == NULL) + return NULL; + + result = hnj_hyphen_load_file(f); + + fclose(f); + return result; +} + +HyphenDict * +hnj_hyphen_load_file (FILE *f) +{ HyphenDict *dict[2]; HashTab *hashtab; - FILE *f; char buf[MAX_CHARS]; int nextlevel = 0; int i, j, k; HashEntry *e; int state_num = 0; - - f = fopen (fn, "r"); - if (f == NULL) - return NULL; - // loading one or two dictionaries (separated by NEXTLEVEL keyword) for (k = 0; k < 2; k++) { hashtab = hnj_hash_new (); @@ -394,9 +403,9 @@ global[k] = hashtab; #endif hnj_hash_insert (hashtab, "", 0); - dict[k] = hnj_malloc (sizeof(HyphenDict)); + dict[k] = (HyphenDict *) hnj_malloc (sizeof(HyphenDict)); dict[k]->num_states = 1; - dict[k]->states = hnj_malloc (sizeof(HyphenState)); + dict[k]->states = (HyphenState *) hnj_malloc (sizeof(HyphenState)); dict[k]->states[0].match = NULL; dict[k]->states[0].repl = NULL; dict[k]->states[0].fallback_state = -1; @@ -497,7 +506,6 @@ #endif state_num = 0; } - fclose(f); if (nextlevel) dict[0]->nextlevel = dict[1]; else { dict[1] -> nextlevel = dict[0]; @@ -553,7 +561,7 @@ char *match; int offset; - prep_word = hnj_malloc (word_size + 3); + prep_word = (char*) hnj_malloc (word_size + 3); j = 0; prep_word[j++] = '.'; @@ -780,10 +788,10 @@ int nHyphCount; size_t prep_word_size = word_size + 3; - prep_word = hnj_malloc (prep_word_size); - matchlen = hnj_malloc ((word_size + 3) * sizeof(int)); - matchindex = hnj_malloc ((word_size + 3) * sizeof(int)); - matchrepl = hnj_malloc ((word_size + 3) * sizeof(char *)); + prep_word = (char*) hnj_malloc (prep_word_size); + matchlen = (int*) hnj_malloc ((word_size + 3) * sizeof(int)); + matchindex = (int*) hnj_malloc ((word_size + 3) * sizeof(int)); + matchrepl = (char**) hnj_malloc ((word_size + 3) * sizeof(char *)); j = 0; prep_word[j++] = '.'; @@ -948,10 +956,10 @@ char * hyphens2; int begin = 0; - rep2 = hnj_malloc (word_size * sizeof(char *)); - pos2 = hnj_malloc (word_size * sizeof(int)); - cut2 = hnj_malloc (word_size * sizeof(int)); - hyphens2 = hnj_malloc (word_size + 3); + rep2 = (char**) hnj_malloc (word_size * sizeof(char *)); + pos2 = (int*) hnj_malloc (word_size * sizeof(int)); + cut2 = (int*) hnj_malloc (word_size * sizeof(int)); + hyphens2 = (char*) hnj_malloc (word_size + 3); for (i = 0; i < word_size; i++) rep2[i] = NULL; for (i = 0; i < word_size; i++) if (hyphens[i]&1 || (begin > 0 && i + 1 == word_size)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/hyphen.h new/hyphen-2.8.8/hyphen.h --- old/hyphen-2.8.6/hyphen.h 2010-11-27 03:20:33.000000000 +0100 +++ new/hyphen-2.8.8/hyphen.h 2014-07-03 11:51:53.000000000 +0200 @@ -55,6 +55,8 @@ extern "C" { #endif /* __cplusplus */ +#include <stdio.h> + typedef struct _HyphenDict HyphenDict; typedef struct _HyphenState HyphenState; typedef struct _HyphenTrans HyphenTrans; @@ -94,6 +96,7 @@ }; HyphenDict *hnj_hyphen_load (const char *fn); +HyphenDict *hnj_hyphen_load_file (FILE *f); void hnj_hyphen_free (HyphenDict *dict); /* obsolete, use hnj_hyphen_hyphenate2() or *hyphenate3() functions) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/hyphen-2.8.6/substrings.c new/hyphen-2.8.8/substrings.c --- old/hyphen-2.8.6/substrings.c 2012-06-29 12:02:24.000000000 +0200 +++ new/hyphen-2.8.8/substrings.c 2014-09-18 17:37:51.000000000 +0200 @@ -200,10 +200,9 @@ if (c<'0' || c>'9') pat[j++]=c; } pat[j]=0; - p = patterns; pattab_key[patterns] = pat; pattab_val[patterns++] = org; - if (patterns>MAXPATHS) die("to many base patterns"); + if (patterns>=MAXPATHS) die("to many base patterns"); } } fclose(in); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
