From: Bruno Haible Date: Tue, 8 Feb 2005 11:31:51 +0000 (+0000) Subject: Fix gcc -Wall warning. X-Git-Tag: v0.14.2~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce7eedf4fb94290cb906adcfc85761556e83f2cb;p=thirdparty%2Fgettext.git Fix gcc -Wall warning. --- diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog index 37bc9d270..6c830cb1f 100644 --- a/gettext-tools/libgrep/ChangeLog +++ b/gettext-tools/libgrep/ChangeLog @@ -1,3 +1,8 @@ +2005-02-08 Bruno Haible + + * kwset.h (kwsincr, kwsprep): Change return type to 'const char *'. + * kwset.c (kwsincr, kwsprep): Likewise. + 2005-02-03 Bruno Haible * dfa.c (dfaexec): Avoid continuing the loop past the end of the diff --git a/gettext-tools/libgrep/kwset.c b/gettext-tools/libgrep/kwset.c index cce920730..b87069043 100644 --- a/gettext-tools/libgrep/kwset.c +++ b/gettext-tools/libgrep/kwset.c @@ -124,7 +124,7 @@ kwsalloc (char const *trans) /* Add the given string to the contents of the keyword set. Return NULL for success, an error message otherwise. */ -char * +const char * kwsincr (kwset_t kws, char const *text, size_t len) { struct kwset *kwset; @@ -374,7 +374,7 @@ treenext (struct tree const *tree, struct trie *next[]) /* Compute the shift for each trie node, as well as the delta table and next cache for the given keyword set. */ -char * +const char * kwsprep (kwset_t kws) { register struct kwset *kwset; diff --git a/gettext-tools/libgrep/kwset.h b/gettext-tools/libgrep/kwset.h index ec8a35716..cc667d525 100644 --- a/gettext-tools/libgrep/kwset.h +++ b/gettext-tools/libgrep/kwset.h @@ -40,11 +40,11 @@ extern kwset_t kwsalloc (char const *); /* Incrementally extend the keyword set to include the given string. Return NULL for success, or an error message. Remember an index number for each keyword included in the set. */ -extern char *kwsincr (kwset_t, char const *, size_t); +extern const char *kwsincr (kwset_t, char const *, size_t); /* When the keyword set has been completely built, prepare it for use. Return NULL for success, or an error message. */ -extern char *kwsprep (kwset_t); +extern const char *kwsprep (kwset_t); /* Search through the given buffer for a member of the keyword set. Return a pointer to the leftmost longest match found, or NULL if