[GRASS-SVN] r70785 - grass/trunk/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2017-03-21 13:58:25 -0700 (Tue, 21 Mar 2017)
New Revision: 70785

Modified:
   grass/trunk/lib/vector/Vlib/break_polygons.c
Log:
vectorlib: reduce compiler warnings

Modified: grass/trunk/lib/vector/Vlib/break_polygons.c
===================================================================
--- grass/trunk/lib/vector/Vlib/break_polygons.c	2017-03-21 20:51:43 UTC (rev 70784)
+++ grass/trunk/lib/vector/Vlib/break_polygons.c	2017-03-21 20:58:25 UTC (rev 70785)
@@ -71,7 +71,7 @@
 static int fpoint;
 
 /* Function called from RTreeSearch for point found */
-static int srch(int id, const struct RTree_Rect *rect, int *arg)
+static int srch(int id, const struct RTree_Rect *rect, void *arg)
 {
     fpoint = id;
     
@@ -196,7 +196,7 @@
 
 	    /* Already in DB? */
 	    fpoint = -1;
-	    RTreeSearch(RTree, &rect, (void *)srch, NULL);
+	    RTreeSearch(RTree, &rect, srch, NULL);
 	    G_debug(3, "fpoint =  %d", fpoint);
 
 	    if (Points->n_points <= 2 ||
@@ -324,7 +324,7 @@
 	    /* One point only or 
 	     * last point and line is not broken, do nothing */
 
-	    RTreeSearch(RTree, &rect, (void *)srch, 0);
+	    RTreeSearch(RTree, &rect, srch, NULL);
 	    G_debug(3, "fpoint =  %d", fpoint);
 
 	    /* read point */
@@ -671,7 +671,7 @@
 void Vect_break_polygons(struct Map_info *Map, int type, struct Map_info *Err)
 {
     if (getenv("GRASS_VECTOR_LOWMEM"))
-	return Vect_break_polygons_file(Map, type, Err);
+	Vect_break_polygons_file(Map, type, Err);
     else
-	return Vect_break_polygons_mem(Map, type, Err);
+	Vect_break_polygons_mem(Map, type, Err);
 }