[GRASS-SVN] r39177 - in grass/trunk: include lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-09-13 12:47:38 -0400 (Sun, 13 Sep 2009)
New Revision: 39177

Modified:
   grass/trunk/include/vector.h
   grass/trunk/lib/vector/Vlib/level_two.c
Log:
long -> plus_t


Modified: grass/trunk/include/vector.h
===================================================================
--- grass/trunk/include/vector.h	2009-09-13 13:39:37 UTC (rev 39176)
+++ grass/trunk/include/vector.h	2009-09-13 16:47:38 UTC (rev 39177)
@@ -186,15 +186,15 @@
 
 /* Get map level 2 informations */
 int Vect_level(const struct Map_info *);
-long Vect_get_num_nodes(const struct Map_info *);
-long Vect_get_num_primitives(const struct Map_info *, int);
-long Vect_get_num_lines(const struct Map_info *);
-long Vect_get_num_areas(const struct Map_info *);
-long Vect_get_num_faces(const struct Map_info *);
-long Vect_get_num_kernels(const struct Map_info *);
-long Vect_get_num_volumes(const struct Map_info *);
-long Vect_get_num_islands(const struct Map_info *);
-long Vect_get_num_holes(const struct Map_info *);
+plus_t Vect_get_num_nodes(const struct Map_info *);
+plus_t Vect_get_num_primitives(const struct Map_info *, int);
+plus_t Vect_get_num_lines(const struct Map_info *);
+plus_t Vect_get_num_areas(const struct Map_info *);
+plus_t Vect_get_num_faces(const struct Map_info *);
+plus_t Vect_get_num_kernels(const struct Map_info *);
+plus_t Vect_get_num_volumes(const struct Map_info *);
+plus_t Vect_get_num_islands(const struct Map_info *);
+plus_t Vect_get_num_holes(const struct Map_info *);
 int Vect_get_line_box(const struct Map_info *, int, struct bound_box *);
 int Vect_get_area_box(const struct Map_info *, int, struct bound_box *);
 int Vect_get_isle_box(const struct Map_info *, int, struct bound_box *);
@@ -462,7 +462,7 @@
 off_t V2_write_line_nat(struct Map_info *, int, const struct line_pnts *,
 			const struct line_cats *);
 #if 0
-long V1_write_line_ogr(struct Map_info *, int, struct line_pnts *,
+off_t V1_write_line_ogr(struct Map_info *, int, struct line_pnts *,
 		       struct line_cats *);
 #endif
 off_t V1_rewrite_line_nat(struct Map_info *, off_t, int,
@@ -470,7 +470,7 @@
 int V2_rewrite_line_nat(struct Map_info *, int, int,
 			const struct line_pnts *, const struct line_cats *);
 #if 0
-long V1_rewrite_line_ogr(struct Map_info *, long offset, int type,
+off_t V1_rewrite_line_ogr(struct Map_info *, off_t, int,
 			 struct line_pnts *, struct line_cats *);
 #endif
 

Modified: grass/trunk/lib/vector/Vlib/level_two.c
===================================================================
--- grass/trunk/lib/vector/Vlib/level_two.c	2009-09-13 13:39:37 UTC (rev 39176)
+++ grass/trunk/lib/vector/Vlib/level_two.c	2009-09-13 16:47:38 UTC (rev 39177)
@@ -25,7 +25,7 @@
 
    \return number of nodes
  */
-long Vect_get_num_nodes(const struct Map_info *map)
+plus_t Vect_get_num_nodes(const struct Map_info *map)
 {
     return (map->plus.n_nodes);
 }
@@ -38,9 +38,9 @@
 
    \return number of primitives
  */
-long Vect_get_num_primitives(const struct Map_info *map, int type)
+plus_t Vect_get_num_primitives(const struct Map_info *map, int type)
 {
-    long int num = 0;
+    plus_t num = 0;
 
     if (type & GV_POINT)
 	num += map->plus.n_plines;
@@ -65,7 +65,7 @@
 
    \return number of features
  */
-long Vect_get_num_lines(const struct Map_info *map)
+plus_t Vect_get_num_lines(const struct Map_info *map)
 {
     return (map->plus.n_lines);
 }
@@ -77,7 +77,7 @@
 
    \return number of areas
  */
-long Vect_get_num_areas(const struct Map_info *map)
+plus_t Vect_get_num_areas(const struct Map_info *map)
 {
     return (map->plus.n_areas);
 }
@@ -89,7 +89,7 @@
 
    \return number of kernels
  */
-long Vect_get_num_kernels(const struct Map_info *map)
+plus_t Vect_get_num_kernels(const struct Map_info *map)
 {
     return (map->plus.n_klines);
 }
@@ -102,7 +102,7 @@
 
    \return number of faces
  */
-long Vect_get_num_faces(const struct Map_info *map)
+plus_t Vect_get_num_faces(const struct Map_info *map)
 {
     return (map->plus.n_flines);
 }
@@ -115,7 +115,7 @@
 
    \return number of volumes
  */
-long Vect_get_num_volumes(const struct Map_info *map)
+plus_t Vect_get_num_volumes(const struct Map_info *map)
 {
     return (map->plus.n_volumes);
 }
@@ -128,7 +128,7 @@
 
    \return number of islands
  */
-long Vect_get_num_islands(const struct Map_info *map)
+plus_t Vect_get_num_islands(const struct Map_info *map)
 {
     return (map->plus.n_isles);
 }
@@ -141,7 +141,7 @@
 
    \return number of holes
  */
-long Vect_get_num_holes(const struct Map_info *map)
+plus_t Vect_get_num_holes(const struct Map_info *map)
 {
     return (map->plus.n_holes);
 }