[GRASS-dev] Re: include/vect/dig_externs.h: Extra prototypes

Ivan Shmakov oneingray at gmail.com
Sun Mar 22 08:19:18 EDT 2009


>>>>> Markus Neteler <neteler at osgeo.org> writes:

 >> The following functions are declared in include/vect/dig_externs.h
 >> (as of a recent SVN checkout), yet there're no trace of their
 >> definitions in the source.

[...]

 > Navigating in the old code there will be the rest.

	I guess, there're more long dead prototypes to be found.

 > If no longer existing, I vote for removal from GRASS 6/7.svn.

	I've applied the patch below to the recent SVN trunk and the
	code seems still to compile without a note on these.

	Unless there'll be any objections, I'm going to apply the patch
	below to the trunk.

	What SVN branch should I merge this one to for GRASS 6?

--- include/vect/dig_externs.h	(revision 36440)
+++ include/vect/dig_externs.h	(working copy)
@@ -35,9 +35,6 @@
 plus_t *dig__long_convert_to_plus_t(long *, plus_t *, int, struct dig_head *);
 char *dig__convert_buffer(int);
 
-plus_t **dig_get_cont_lines(struct Map_info *, plus_t, double, int);
-plus_t dig_get_next_cont_line(struct Map_info *, plus_t, double, int);
-
 struct dig_head *dig_get_head(void);
 struct dig_head *dig__get_head(void);
 void dig_init_portable(struct Port_info *, int);
@@ -119,8 +116,6 @@
 void dig_free_plus_isles(struct Plus_head *);
 void dig_free_plus(struct Plus_head *);
 int dig_load_plus(struct Plus_head *, GVFILE *, int);
-int dig_map_to_head(struct Map_info *, struct Plus_head *);
-int dig_head_to_map(struct Plus_head *, struct Map_info *);
 int dig_spindex_init(struct Plus_head *);
 
 /* int dig_snap_line_to_node (struct Map_info *, int, int, struct line_pnts *); */
@@ -138,9 +133,6 @@
 
 /* int dig_node_del_line (struct Plus_head *plus, int node, int line);
    int dig_add_line_to_node (int, int, char, struct Map_info *, struct line_pnts *); */
-int dig_point_to_area(struct Map_info *, double, double);
-int dig_point_to_next_area(struct Map_info *, double, double, double *);
-int dig_point_to_line(struct Map_info *, double, double, char);
 
 /* list of updated */
 void dig_line_reset_updated(struct Plus_head *Plus);
@@ -194,12 +186,7 @@
 int dig_read_cidx(GVFILE *, struct Plus_head *, int);
 
 /* int dig_in_line_bbox (P_LINE *, double, double); */
-int dig_check_dist(struct Map_info *, int, double, double, double *);
-int dig__check_dist(struct Map_info *, struct line_pnts *, double, double,
-		    double *);
 /* int dig_center_check (P_LINE *, int, int, double, double); */
-int dig_point_by_line(struct Map_info *, double, double, double, double,
-		      char);
 /* int dig_by_line_bbox (P_LINE *, double, double, double, double); */
 int dig_prune(struct line_pnts *, double);
 int dig_write_head_ascii(FILE *, struct dig_head *);

-- 
FSF associate member #7257


More information about the grass-dev mailing list