2009-09-07 Jerry DeLisle <jvdelisle@gcc.gnu.org>

	PR libgfortran/41192
	* io/list_read.c (eat_line): Enable eat_line to function on
	internal units.

	PR libgfortran/41219
	* io/list_read.c (nml_read_obj): Replace GFC_DTYPE_UNKNOWN with
	BT_NULL to get rid of warning.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151495 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 14d823d..262039a 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-07  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/41192
+       * io/list_read.c (eat_line): Enable eat_line to function on
+       internal units.
+
+       PR libgfortran/41219
+       * io/list_read.c (nml_read_obj): Replace GFC_DTYPE_UNKNOWN with
+       BT_NULL to get rid of warning.
+       
 2009-09-04  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/41219

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index bcc00e1..d8ad602 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -287,10 +287,10 @@ static void
 eat_line (st_parameter_dt *dtp)
 {
   char c;
-  if (!is_internal_unit (dtp))
-    do
-      c = next_char (dtp);
-    while (c != '\n');
+
+  do
+    c = next_char (dtp);
+  while (c != '\n');
 }
 
 
@@ -2374,10 +2374,10 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info * nl, index_type offset,
          if (dtp->u.p.input_complete)
            return SUCCESS;
 
-         /* GFC_TYPE_UNKNOWN through for nulls and is detected
-            after the switch block.  */
+         /* BT_NULL (equivalent to GFC_DTYPE_UNKNOWN) falls through
+            for nulls and is detected at default: of switch block.  */
 
-         dtp->u.p.saved_type = GFC_DTYPE_UNKNOWN;
+         dtp->u.p.saved_type = BT_NULL;
          free_saved (dtp);
 
           switch (nl->type)
@@ -2467,7 +2467,7 @@ nml_read_obj (st_parameter_dt *dtp, namelist_info * nl, index_type offset,
          return SUCCESS;
        }
 
-      if (dtp->u.p.saved_type == GFC_DTYPE_UNKNOWN)
+      if (dtp->u.p.saved_type == BT_NULL)
        {
          dtp->u.p.expanded_read = 0;
          goto incr_idx;