libvector : reading files with 'struct Map_info*' objects is technica…

…lly not const (#2894) The qualifier is removed from the API and code using it. Co-authored-by: Māris Nartišs <[email protected]>
OSGeo · Nov 21, 2023 · 765b2e9 · 765b2e9
1 parent 6a4b46d
commit 765b2e9
Show file tree

Hide file tree

Showing 48 changed files with 366 additions and 381 deletions.
diff --git a/include/grass/defs/vector.h b/include/grass/defs/vector.h
diff --git a/lib/vector/Vlib/area.c b/lib/vector/Vlib/area.c
@@ -34,7 +34,7 @@
    \return number of points
    \return -1 on error
  */
-int Vect_get_area_points(const struct Map_info *Map, int area,
+int Vect_get_area_points(struct Map_info *Map, int area,
                          struct line_pnts *BPoints)
 {
     const struct Plus_head *Plus;
@@ -65,7 +65,7 @@ int Vect_get_area_points(const struct Map_info *Map, int area,
    \return number of points
    \return -1 on error
  */
-int Vect_get_isle_points(const struct Map_info *Map, int isle,
+int Vect_get_isle_points(struct Map_info *Map, int isle,
                          struct line_pnts *BPoints)
 {
     const struct Plus_head *Plus;
@@ -107,7 +107,7 @@ int Vect_get_isle_points(const struct Map_info *Map, int isle,
    \return centroid id of area
    \return 0 if no centroid found
  */
-int Vect_get_area_centroid(const struct Map_info *Map, int area)
+int Vect_get_area_centroid(struct Map_info *Map, int area)
 {
     const struct Plus_head *Plus;
     struct P_area *Area;
@@ -136,8 +136,7 @@ int Vect_get_area_centroid(const struct Map_info *Map, int area)
 
    \return number of boundaries
  */
-int Vect_get_area_boundaries(const struct Map_info *Map, int area,
-                             struct ilist *List)
+int Vect_get_area_boundaries(struct Map_info *Map, int area, struct ilist *List)
 {
     int i, line;
     const struct Plus_head *Plus;
@@ -173,8 +172,7 @@ int Vect_get_area_boundaries(const struct Map_info *Map, int area,
 
    \return number of boundaries
  */
-int Vect_get_isle_boundaries(const struct Map_info *Map, int isle,
-                             struct ilist *List)
+int Vect_get_isle_boundaries(struct Map_info *Map, int isle, struct ilist *List)
 {
     int i, line;
     const struct Plus_head *Plus;
@@ -207,7 +205,7 @@ int Vect_get_isle_boundaries(const struct Map_info *Map, int isle,
    \return number of isles for area
    \return 0 if area not found
  */
-int Vect_get_area_num_isles(const struct Map_info *Map, int area)
+int Vect_get_area_num_isles(struct Map_info *Map, int area)
 {
     const struct Plus_head *Plus;
     struct P_area *Area;
@@ -235,7 +233,7 @@ int Vect_get_area_num_isles(const struct Map_info *Map, int area)
    \return isle id
    \return 0 if no isle found
  */
-int Vect_get_area_isle(const struct Map_info *Map, int area, int isle)
+int Vect_get_area_isle(struct Map_info *Map, int area, int isle)
 {
     const struct Plus_head *Plus;
     struct P_area *Area;
@@ -262,7 +260,7 @@ int Vect_get_area_isle(const struct Map_info *Map, int area, int isle)
    \return area id
    \return 0 area not found
  */
-int Vect_get_isle_area(const struct Map_info *Map, int isle)
+int Vect_get_isle_area(struct Map_info *Map, int isle)
 {
     const struct Plus_head *Plus;
     struct P_isle *Isle;
@@ -289,7 +287,7 @@ int Vect_get_isle_area(const struct Map_info *Map, int isle)
    \return perimeter of area with perimeters of isles in meters
  */
 
-double Vect_get_area_perimeter(const struct Map_info *Map, int area)
+double Vect_get_area_perimeter(struct Map_info *Map, int area)
 {
     const struct Plus_head *Plus;
     struct P_area *Area;
@@ -333,7 +331,7 @@ double Vect_get_area_perimeter(const struct Map_info *Map, int area)
    \return 1 if point is inside area
    \return 2 if point is on the area's outer ring
  */
-int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area,
+int Vect_point_in_area(double x, double y, struct Map_info *Map, int area,
                        struct bound_box *box)
 {
     int i, isle;
@@ -374,7 +372,7 @@ int Vect_point_in_area(double x, double y, const struct Map_info *Map, int area,
 
    \return area of area without areas of isles
  */
-double Vect_get_area_area(const struct Map_info *Map, int area)
+double Vect_get_area_area(struct Map_info *Map, int area)
 {
     const struct Plus_head *Plus;
     struct P_area *Area;
@@ -422,8 +420,7 @@ double Vect_get_area_area(const struct Map_info *Map, int area)
    \return 0 centroid found (but may be without categories)
    \return 1 no centroid found
  */
-int Vect_get_area_cats(const struct Map_info *Map, int area,
-                       struct line_cats *Cats)
+int Vect_get_area_cats(struct Map_info *Map, int area, struct line_cats *Cats)
 {
     int centroid;
 
@@ -450,7 +447,7 @@ int Vect_get_area_cats(const struct Map_info *Map, int area,
    \return first found category of given field
    \return -1 no centroid or no category found
  */
-int Vect_get_area_cat(const struct Map_info *Map, int area, int field)
+int Vect_get_area_cat(struct Map_info *Map, int area, int field)
 {
     int i;
     static struct line_cats *Cats = NULL;
@@ -487,7 +484,7 @@ int Vect_get_area_cat(const struct Map_info *Map, int area, int field)
    \return number of points
    \return -1 on error
  */
-int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines,
+int Vect__get_area_points(struct Map_info *Map, const plus_t *lines,
                           int n_lines, struct line_pnts *BPoints)
 {
     if (Map->format == GV_FORMAT_POSTGIS && Map->fInfo.pg.toposchema_name &&
@@ -516,7 +513,7 @@ int Vect__get_area_points(const struct Map_info *Map, const plus_t *lines,
    \return number of points
    \return -1 on error
  */
-int Vect__get_area_points_nat(const struct Map_info *Map, const plus_t *lines,
+int Vect__get_area_points_nat(struct Map_info *Map, const plus_t *lines,
                               int n_lines, struct line_pnts *BPoints)
 {
     int i, line, aline, dir;

diff --git a/lib/vector/Vlib/area_pg.c b/lib/vector/Vlib/area_pg.c
@@ -34,7 +34,7 @@ static PGresult *build_stmt(const struct Plus_head *,
    \return number of points
    \return -1 on error
  */
-int Vect__get_area_points_pg(const struct Map_info *Map, const plus_t *lines,
+int Vect__get_area_points_pg(struct Map_info *Map, const plus_t *lines,
                              int n_lines, struct line_pnts *APoints)
 {
     int i, direction;

diff --git a/lib/vector/Vlib/array.c b/lib/vector/Vlib/array.c
@@ -76,7 +76,7 @@ struct varray *Vect_new_varray(int size)
    \return number of items set
    \return -1 on error
  */
-int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field,
+int Vect_set_varray_from_cat_string(struct Map_info *Map, int field,
                                     const char *cstring, int type, int value,
                                     struct varray *varray)
 {
@@ -121,7 +121,7 @@ int Vect_set_varray_from_cat_string(const struct Map_info *Map, int field,
    \return number of items set
    \return -1 on error
  */
-int Vect_set_varray_from_cat_list(const struct Map_info *Map, int field,
+int Vect_set_varray_from_cat_list(struct Map_info *Map, int field,
                                   struct cat_list *clist, int type, int value,
                                   struct varray *varray)
 {
@@ -239,9 +239,8 @@ static int in_array(int *cats, size_t ncats, int cat)
    \return number of items set
    \return -1 on error
  */
-int Vect_set_varray_from_db(const struct Map_info *Map, int field,
-                            const char *where, int type, int value,
-                            struct varray *varray)
+int Vect_set_varray_from_db(struct Map_info *Map, int field, const char *where,
+                            int type, int value, struct varray *varray)
 {
     int i, n, c, centr, *cats;
     int ncats;

diff --git a/lib/vector/Vlib/box.c b/lib/vector/Vlib/box.c
@@ -232,8 +232,7 @@ int Vect_box_clip(double *x, double *y, double *c_x, double *c_y,
    \return 0 line is dead
    \return -1 on error
  */
-int Vect_get_line_box(const struct Map_info *Map, int line,
-                      struct bound_box *Box)
+int Vect_get_line_box(struct Map_info *Map, int line, struct bound_box *Box)
 {
     struct Plus_head *Plus;
     struct P_line *Line;
@@ -298,8 +297,7 @@ int Vect_get_line_box(const struct Map_info *Map, int line,
    \return 0 area is dead
    \return -1 on error
  */
-int Vect_get_area_box(const struct Map_info *Map, int area,
-                      struct bound_box *Box)
+int Vect_get_area_box(struct Map_info *Map, int area, struct bound_box *Box)
 {
     struct Plus_head *Plus;
     struct P_area *Area;
@@ -344,8 +342,7 @@ int Vect_get_area_box(const struct Map_info *Map, int area,
    \return 0 isle is dead / bounding box not found
    \return -1 on error
  */
-int Vect_get_isle_box(const struct Map_info *Map, int isle,
-                      struct bound_box *Box)
+int Vect_get_isle_box(struct Map_info *Map, int isle, struct bound_box *Box)
 {
     struct Plus_head *Plus;
     struct P_isle *Isle;
@@ -388,7 +385,7 @@ int Vect_get_isle_box(const struct Map_info *Map, int isle,
    \return 1 on success
    \return 0 on error
  */
-int Vect_get_map_box(const struct Map_info *Map, struct bound_box *Box)
+int Vect_get_map_box(struct Map_info *Map, struct bound_box *Box)
 {
     const struct Plus_head *Plus;
 

diff --git a/lib/vector/Vlib/buffer2.c b/lib/vector/Vlib/buffer2.c
@@ -1071,10 +1071,10 @@ void Vect_line_buffer2(const struct line_pnts *Points, double da, double db,
    \param[out] inner_count number of holes
    \param[out] iPoints array of output polygon's holes (cw order)
  */
-void Vect_area_buffer2(const struct Map_info *Map, int area, double da,
-                       double db, double dalpha, int round, int caps,
-                       double tol, struct line_pnts **oPoints,
-                       struct line_pnts ***iPoints, int *inner_count)
+void Vect_area_buffer2(struct Map_info *Map, int area, double da, double db,
+                       double dalpha, int round, int caps, double tol,
+                       struct line_pnts **oPoints, struct line_pnts ***iPoints,
+                       int *inner_count)
 {
     struct line_pnts *tPoints, *outer;
     struct line_pnts **isles;

diff --git a/lib/vector/Vlib/build.c b/lib/vector/Vlib/build.c
@@ -754,7 +754,7 @@ int Vect_topo_check(struct Map_info *Map, struct Map_info *Err)
 
    \return current highest built level
  */
-int Vect_get_built(const struct Map_info *Map)
+int Vect_get_built(struct Map_info *Map)
 {
     return Map->plus.built;
 }
@@ -1051,7 +1051,7 @@ int Vect_save_topo(struct Map_info *Map)
    \return 1 on success
    \return 0 on error
  */
-int Vect_topo_dump(const struct Map_info *Map, FILE *out)
+int Vect_topo_dump(struct Map_info *Map, FILE *out)
 {
     int i, j, line, isle;
     float angle_deg;
@@ -1241,7 +1241,7 @@ int Vect_build_sidx(struct Map_info *Map)
 
    \return 1
  */
-int Vect_build_sidx_from_topo(const struct Map_info *Map)
+int Vect_build_sidx_from_topo(struct Map_info *Map)
 {
     G_debug(3, "Vect_build_sidx_from_topo(): name=%s", Vect_get_full_name(Map));
 
@@ -1312,7 +1312,7 @@ int Vect_save_sidx(struct Map_info *Map)
    \return 1 on success
    \return 0 on error
  */
-int Vect_sidx_dump(const struct Map_info *Map, FILE *out)
+int Vect_sidx_dump(struct Map_info *Map, FILE *out)
 {
     if (!(Map->plus.Spidx_built)) {
         Vect_build_sidx_from_topo(Map);

diff --git a/lib/vector/Vlib/build_sfa.c b/lib/vector/Vlib/build_sfa.c
@@ -747,7 +747,7 @@ int Vect__build_sfa(struct Map_info *Map, int build)
    \return 1 on success
    \return 0 on error
  */
-int Vect_fidx_dump(const struct Map_info *Map, FILE *out)
+int Vect_fidx_dump(struct Map_info *Map, FILE *out)
 {
     int i;
     const struct Format_info_offset *offset;