From 01e4ad38caf2b992b701d3bf0c1505c22ab22ec2 Mon Sep 17 00:00:00 2001
From: jvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 12 Jan 2007 23:10:27 +0000
Subject: [PATCH] 2007-01-12 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/30435
* io/list_read.c (finish_separator): Don't call next_record.
(list_formatted_read_scalar): Clean up some comments and whitespace.
(nml_read_obj): Whitespace fix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120737 138bc75d-0d04-0410-961f-82ee72b054a4
---
libgfortran/ChangeLog | 7 +++++++
libgfortran/io/list_read.c | 14 ++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 5053e04e8a27..17c960738d34 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-12 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR libgfortran/30435
+ * io/list_read.c (finish_separator): Don't call next_record.
+ (list_formatted_read_scalar): Clean up some comments and whitespace.
+ (nml_read_obj): Whitespace fix.
+
2007-01-05 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/30162
diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 9092c1a507b5..6379776b9bba 100644
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -362,7 +362,8 @@ finish_separator (st_parameter_dt *dtp)
case '/':
dtp->u.p.input_complete = 1;
- if (!dtp->u.p.namelist_mode) next_record (dtp, 0);
+ if (!dtp->u.p.namelist_mode)
+ return;
break;
case '\n':
@@ -1492,15 +1493,16 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, int kind,
c = eat_spaces (dtp);
if (is_separator (c))
- { /* Found a null value. */
+ {
+ /* Found a null value. */
eat_separator (dtp);
dtp->u.p.repeat_count = 0;
- /* eat_separator sets this flag if the separator was a comma */
+ /* eat_separator sets this flag if the separator was a comma. */
if (dtp->u.p.comma_flag)
goto cleanup;
- /* eat_separator sets this flag if the separator was a \n or \r */
+ /* eat_separator sets this flag if the separator was a \n or \r. */
if (dtp->u.p.at_eol)
finish_separator (dtp);
else
@@ -1525,7 +1527,7 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p, int kind,
else
{
eat_spaces (dtp);
- /* trailing spaces prior to end of line */
+ /* Trailing spaces prior to end of line. */
if (dtp->u.p.at_eol)
finish_separator (dtp);
}
@@ -2041,7 +2043,7 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info * nl, index_type offset,
index_type dlen;
index_type m;
index_type obj_name_len;
- void * pdata ;
+ void * pdata;
/* This object not touched in name parsing. */
--
GitLab