[GRASS-SVN] r60396 - grass/branches/develbranch_6/raster/r.in.xyz

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-05-21 16:21:28 -0700 (Wed, 21 May 2014)
New Revision: 60396

Modified:
   grass/branches/develbranch_6/raster/r.in.xyz/main.c
Log:
wenzeslaus: explicitly set variable to close input file for compiles which do not zero new variables. (for correctness, would be closed upon exit anyway)  Backport from trunk

Modified: grass/branches/develbranch_6/raster/r.in.xyz/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.xyz/main.c	2014-05-21 21:24:17 UTC (rev 60395)
+++ grass/branches/develbranch_6/raster/r.in.xyz/main.c	2014-05-21 23:21:28 UTC (rev 60396)
@@ -466,6 +466,7 @@
 	infile = G_store("stdin");	/* filename for history metadata */
     }
     else {
+	from_stdin = FALSE;
 	if ((in_fp = fopen(infile, "r")) == NULL)
 	    G_fatal_error(_("Unable to open input file <%s>"), infile);
     }
@@ -485,6 +486,7 @@
 	scan_bounds(in_fp, xcol, ycol, zcol, fs, shell_style->answer,
 		    skipline->answer, zscale);
 
+	/* close input file */
 	if (!from_stdin)
 	    fclose(in_fp);