From 264aa350f10afaedbd96ca64f232c8b4498a37f4 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 28 May 2011 20:58:14 +0200 Subject: [PATCH] parse-datetime.y: accommodate -Wstrict-overflow * lib/parse-datetime.y (yylex): Rearrange pointer arithmetic to placate -Wstrict-overflow. (cherry picked from commit a8ff65c566a6391a3c1e832452b6b594eb51f180) --- ChangeLog | 4 ++++ lib/parse-datetime.y | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f5235a1b..1ee66705c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-05-28 Jim Meyering + parse-datetime.y: accommodate -Wstrict-overflow + * lib/parse-datetime.y (yylex): Rearrange pointer arithmetic to + placate -Wstrict-overflow. + trim: avoid a warning from -O2 -Wstrict-overflow * lib/trim.c (trim2): Declare local to be "unsigned int", not "int". diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y index d77955f40..23a9a4159 100644 --- a/lib/parse-datetime.y +++ b/lib/parse-datetime.y @@ -1119,7 +1119,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) do { - if (p < buff + sizeof buff - 1) + if (p - buff < sizeof buff - 1) *p++ = c; c = *++pc->input; } -- 2.11.0