[GRASS-SVN] r70613 - grass/trunk/vector/v.distance

[svn_grass at osgeo.org]

Author: hcho
Date: 2017-02-18 00:59:26 -0800 (Sat, 18 Feb 2017)
New Revision: 70613

Modified:
   grass/trunk/vector/v.distance/main.c
Log:
v.distance: Define default column names for -p; Suppress compiler warnings

Modified: grass/trunk/vector/v.distance/main.c
===================================================================
--- grass/trunk/vector/v.distance/main.c	2017-02-18 08:43:49 UTC (rev 70612)
+++ grass/trunk/vector/v.distance/main.c	2017-02-18 08:59:26 UTC (rev 70613)
@@ -286,6 +286,11 @@
 	    Upload[i].upload = TO_ATTR;
 	}
 
+	/* store relation names if -p is given because column= and -p are
+	 * mutually exclusive */
+	if (flag.print->answer)
+	    Upload[i].column = G_store(opt.upload->answers[i]);
+
 	i++;
     }
     Upload[i].upload = END;
@@ -627,6 +632,9 @@
     /* Go through all lines in 'from' and find nearest in 'to' for each */
     /* Note: as from_type is restricted to GV_POINTS (for now) everything is simple */
 
+    /* suppress compiler warnings */
+    tx = ty = tz = fx = fy = fz = 0;
+
     count = 0;			/* count of distances in 'do_all' mode */
     /* Find nearest features for 'from' lines */
     if (nfromlines) {