From 131e2fef683836d45262423bbdf004a014335aba Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 16 Oct 2000 18:05:01 +0000 Subject: [PATCH] * src/reader.c (parse_expect_decl): Use `skip_white_space' and `read_signed_integer'. --- ChangeLog | 6 ++++++ src/reader.c | 23 ++++------------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3bfd492..c29a7505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-16 Akim Demaille + + * src/reader.c (parse_expect_decl): Use `skip_white_space' and + `read_signed_integer'. + + 2000-10-16 Akim Demaille * src/reader.c (copy_dollar): New function. diff --git a/src/reader.c b/src/reader.c index e35e4f38..cdacc071 100644 --- a/src/reader.c +++ b/src/reader.c @@ -773,28 +773,13 @@ parse_union_decl (void) static void parse_expect_decl (void) { - int c; - size_t count; - char buffer[20]; - - c = getc (finput); - while (c == ' ' || c == '\t') - c = getc (finput); - - count = 0; - while (c >= '0' && c <= '9') - { - if (count < sizeof(buffer) - 1) - buffer[count++] = c; - c = getc (finput); - } - buffer[count] = 0; - + int c = skip_white_space (); ungetc (c, finput); - if (count <= 0 || count > 10) + if (!isdigit (c)) complain (_("argument of %%expect is not an integer")); - expected_conflicts = atoi (buffer); + else + expected_conflicts = read_signed_integer (finput); } -- 2.47.2