[GRASS-SVN] r58895 - grass/branches/develbranch_6/raster/r.li/r.li.daemon

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-02-05 18:08:40 -0800 (Wed, 05 Feb 2014)
New Revision: 58895

Modified:
   grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
Log:
more readable variable name, define variables at start of function

Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c	2014-02-06 02:07:19 UTC (rev 58894)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c	2014-02-06 02:08:40 UTC (rev 58895)
@@ -224,7 +224,7 @@
 
 char *mask_preprocessing(char *mask, char *raster, int rl, int cl)
 {
-    char *mapset, *tmp_file;
+    char *mapset, *mask_mapset, *tmp_file;
     struct Cell_head cell, oldcell;
     int mask_fd, old_fd, *buf, i, j;
     CELL *old;
@@ -241,10 +241,9 @@
     if (G_get_cellhd(raster, mapset, &cell) == -1)
 	return NULL;
 
-    /* mmapset is used hold the mapset where mask is saved */
-    char *mmapset = G_find_cell(mask, "");
+    mask_mapset = G_find_cell(mask, "");
     /* open raster */
-    if (G_get_cellhd(mask, mmapset, &oldcell) == -1)
+    if (G_get_cellhd(mask, mask_mapset, &oldcell) == -1)
 	return NULL;
 
     add_row = 1.0 * oldcell.rows / rl;