From 0146fc9d1ec1b324445da4f89e95184c22308241 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 17 Jun 2008 16:01:28 +0000 Subject: * app.c (do_scrub_chars): Do not UNGET an EOF value. * ti.h (GET_SCNHDR_NLNNO): Provide an alternative version of this macro which does not trigger an array bounds warning in gcc. (PUT_SCNHDR_NLNNO): Likewise. (GET_SCNHDR_FLAGS): Likewise. (PUT_SCNHDR_FLAGS): Likewise. (GET_SCNHDR_PAGE): Likewise. (PUT_SCNHDR_PAGE): Likewise. --- gas/app.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gas/app.c') diff --git a/gas/app.c b/gas/app.c index 4ba9edc..8884d9b 100644 --- a/gas/app.c +++ b/gas/app.c @@ -676,7 +676,7 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen) if (ch == '\'') /* Change to avoid warning about unclosed string. */ PUT ('`'); - else + else if (ch != EOF) UNGET (ch); break; #endif @@ -1097,7 +1097,8 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen) ch2 = GET (); if (ch2 != '-') { - UNGET (ch2); + if (ch2 != EOF) + UNGET (ch2); goto de_fault; } /* Read and skip to end of line. */ @@ -1283,7 +1284,8 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen) state = 9; if (!IS_SYMBOL_COMPONENT (ch)) { - UNGET (ch); + if (ch != EOF) + UNGET (ch); break; } } @@ -1407,4 +1409,3 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen) return to - tostart; } - -- cgit v1.1