aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cppfiles.c13
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 37cb3f0..f8f5aa3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-18 17:46 -0400 Zack Weinberg <zack@rabi.columbia.edu>
+
+ * cppfiles.c (find_position, read_and_prescan): Use `unsigned
+ long' variables consistently to count line and column numbers.
+
Sun Apr 18 15:50:33 EDT 1999 John Wehle (john@feith.com)
* output.h (current_function_is_leaf,
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 6fd2407..e2305c6 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -764,10 +764,10 @@ static void
find_position (start, limit, linep, colp)
U_CHAR *start;
U_CHAR *limit;
- long *linep;
- long *colp;
+ unsigned long *linep;
+ unsigned long *colp;
{
- long line = *linep, col = 0;
+ unsigned long line = *linep, col = 0;
while (start < limit)
{
U_CHAR ch = *start++;
@@ -818,7 +818,8 @@ read_and_prescan (pfile, fp, desc, len)
U_CHAR *buf = (U_CHAR *) xmalloc (len);
U_CHAR *ip, *op, *line_base;
U_CHAR *ibase;
- unsigned int line, deferred_newlines;
+ unsigned long line;
+ unsigned int deferred_newlines;
int count;
size_t offset;
/* PIPE_BUF bytes of buffer proper, 2 to detect running off the end
@@ -1014,7 +1015,7 @@ read_and_prescan (pfile, fp, desc, len)
if (CPP_OPTIONS (pfile)->warn_trigraphs)
{
- long col;
+ unsigned long col;
find_position (line_base, op, &line, &col);
line_base = op - col;
cpp_warning_with_line (pfile, line, col,
@@ -1066,7 +1067,7 @@ read_and_prescan (pfile, fp, desc, len)
if (op[-1] != '\n')
{
- long col;
+ unsigned long col;
find_position (line_base, op, &line, &col);
cpp_warning_with_line (pfile, line, col, "no newline at end of file\n");
if (offset + 1 > len)