Mercurial > hg > octave-nkf > gnulib-hg
changeset 17666:889867abe1ae
mbsstr, quotearg, xstrtol: pacify IRIX 6.5 cc
These were found when building the latest grep snapshot on IRIX 6.5.
* lib/mbsstr.c (knuth_morris_pratt_multibyte): Break "a=b=c;" into
"b=c; a=b;", since IRIX 6.5 cc complains about the former if b is
never used later.
* lib/quotearg.c (quoting_options_from_style):
* lib/xstrtol.c (__xstrtol):
Use enum instead of 0, to pacify IRIX 6.5 cc.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Sun, 11 May 2014 00:36:37 -0700 |
parents | 91395f852131 |
children | 2b0bea4ad42e |
files | ChangeLog lib/mbsstr.c lib/quotearg.c lib/xstrtol.c |
diffstat | 4 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-05-11 Paul Eggert <eggert@cs.ucla.edu> + + mbsstr, quotearg, xstrtol: pacify IRIX 6.5 cc + These were found when building the latest grep snapshot on IRIX 6.5. + * lib/mbsstr.c (knuth_morris_pratt_multibyte): Break "a=b=c;" into + "b=c; a=b;", since IRIX 6.5 cc complains about the former if b is + never used later. + * lib/quotearg.c (quoting_options_from_style): + * lib/xstrtol.c (__xstrtol): + Use enum instead of 0, to pacify IRIX 6.5 cc. + 2014-04-18 Pádraig Brady <P@draigBrady.com> gitlog-to-changelog: revert inclusion of git-log-fix file
--- a/lib/mbsstr.c +++ b/lib/mbsstr.c @@ -50,7 +50,8 @@ if (memory == NULL) return false; needle_mbchars = memory; - table = table_memory = needle_mbchars + m; + table_memory = needle_mbchars + m; + table = table_memory; /* Fill needle_mbchars. */ {
--- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -178,7 +178,7 @@ static struct quoting_options /* NOT PURE!! */ quoting_options_from_style (enum quoting_style style) { - struct quoting_options o = { 0, 0, { 0 }, NULL, NULL }; + struct quoting_options o = { literal_quoting_style, 0, { 0 }, NULL, NULL }; if (style == custom_quoting_style) abort (); o.style = style;