# HG changeset patch # User Paul Eggert # Date 1399793797 25200 # Node ID 889867abe1ae72a283029c5ee9e6439ba2734853 # Parent 91395f8521316e389f4f83208c26ed8e1d09f5c8 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. diff -r 91395f852131 -r 889867abe1ae ChangeLog --- a/ChangeLog Mon May 05 11:10:30 2014 -0700 +++ b/ChangeLog Sun May 11 00:36:37 2014 -0700 @@ -1,3 +1,14 @@ +2014-05-11 Paul Eggert + + 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 gitlog-to-changelog: revert inclusion of git-log-fix file diff -r 91395f852131 -r 889867abe1ae lib/mbsstr.c --- a/lib/mbsstr.c Mon May 05 11:10:30 2014 -0700 +++ b/lib/mbsstr.c Sun May 11 00:36:37 2014 -0700 @@ -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. */ { diff -r 91395f852131 -r 889867abe1ae lib/quotearg.c --- a/lib/quotearg.c Mon May 05 11:10:30 2014 -0700 +++ b/lib/quotearg.c Sun May 11 00:36:37 2014 -0700 @@ -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; diff -r 91395f852131 -r 889867abe1ae lib/xstrtol.c --- a/lib/xstrtol.c Mon May 05 11:10:30 2014 -0700 +++ b/lib/xstrtol.c Sun May 11 00:36:37 2014 -0700 @@ -182,7 +182,7 @@ break; case 'c': - overflow = 0; + overflow = LONGINT_OK; break; case 'E': /* exa or exbi */