[GRASS-SVN] r71222 - grass/branches/releasebranch_7_0/vector/v.surf.bspline

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-06-26 06:20:26 -0700 (Mon, 26 Jun 2017)
New Revision: 71222

Modified:
   grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c
Log:
v.surf.bspline: fix shadowed variables + G_free() usage

Modified: grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c	2017-06-26 13:14:32 UTC (rev 71221)
+++ grass/branches/releasebranch_7_0/vector/v.surf.bspline/main.c	2017-06-26 13:20:26 UTC (rev 71222)
@@ -486,8 +486,8 @@
 	G_percent(row, nrows, 2);
 
 	if (mask_opt->answer) {
-	    int row, col, maskfd;
-	    DCELL dval, *drastbuf;
+	    int col, maskfd;
+	    DCELL dval;
 	    char mask_val;
 	    
 	    G_message(_("Load masking map"));
@@ -503,7 +503,6 @@
 		G_fatal_error(_("Can not initialize temporary file"));
 
 	    maskfd = Rast_open_old(mask_opt->answer, "");
-	    drastbuf = Rast_allocate_buf(DCELL_TYPE);
 
 	    for (row = 0; row < nrows; row++) {
 		G_percent(row, nrows, 2);
@@ -520,11 +519,11 @@
 	    }
 
 	    G_percent(row, nrows, 2);
-	    G_free(drastbuf);
 	    Rast_close(maskfd);
 	    
 	    have_mask = 1;
 	}
+	G_free(drastbuf);
     }
 
     /*------------------------------------------------------------------