[GRASS-SVN] r53596 - in grass/trunk: general/g.rename vector/v.proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-28 10:49:44 -0700 (Sun, 28 Oct 2012)
New Revision: 53596

Modified:
   grass/trunk/general/g.rename/main.c
   grass/trunk/vector/v.proj/main.c
Log:
replace G__location_path() by G_location_path()


Modified: grass/trunk/general/g.rename/main.c
===================================================================
--- grass/trunk/general/g.rename/main.c	2012-10-28 17:48:16 UTC (rev 53595)
+++ grass/trunk/general/g.rename/main.c	2012-10-28 17:49:44 UTC (rev 53596)
@@ -56,7 +56,7 @@
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
-    location_path = G__location_path();
+    location_path = G_location_path();
     mapset = G_mapset();
 
     for (n = 0; n < nlist; n++) {

Modified: grass/trunk/vector/v.proj/main.c
===================================================================
--- grass/trunk/vector/v.proj/main.c	2012-10-28 17:48:16 UTC (rev 53595)
+++ grass/trunk/vector/v.proj/main.c	2012-10-28 17:49:44 UTC (rev 53596)
@@ -38,7 +38,7 @@
     int out_zone = 0;
     int overwrite;		/* overwrite output map */
     const char *mapset;
-    const char *omap_name, *map_name, *iset_name, *oset_name, *iloc_name;
+    const char *omap_name, *map_name, *iset_name, *iloc_name;
     struct pj_info info_in;
     struct pj_info info_out;
     const char *gbase;
@@ -148,8 +148,6 @@
     else
 	iset_name = G_store(G_mapset());
 
-    oset_name = G_store(G_mapset());
-
     iloc_name = ilocopt->answer;
 
     if (ibaseopt->answer)
@@ -222,7 +220,7 @@
 	    exit(EXIT_FAILURE);
 
 	Vect_set_open_level(1);
-	G_debug(1, "Open old: location: %s mapset : %s", G__location_path(),
+	G_debug(1, "Open old: location: %s mapset : %s", G_location_path(),
 		G_mapset());
 	Vect_open_old(&Map, map_name, mapset);
     }
@@ -362,7 +360,7 @@
 	    tgt_box.S = y;
     }
 
-    G_debug(1, "Open new: location: %s mapset : %s", G__location_path(),
+    G_debug(1, "Open new: location: %s mapset : %s", G_location_path(),
 	    G_mapset());
     Vect_open_new(&Out_Map, omap_name, Vect_is_3d(&Map));