[GRASS-SVN] r45127 - grass/branches/releasebranch_6_4/raster/r.proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-21 02:27:34 -0800 (Fri, 21 Jan 2011)
New Revision: 45127

Modified:
   grass/branches/releasebranch_6_4/raster/r.proj/main.c
Log:
r.proj fix segfault when mapset is not given, be less verbose
(merge r45126 from devbr6)


Modified: grass/branches/releasebranch_6_4/raster/r.proj/main.c
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.proj/main.c	2011-01-21 10:25:20 UTC (rev 45126)
+++ grass/branches/releasebranch_6_4/raster/r.proj/main.c	2011-01-21 10:27:34 UTC (rev 45127)
@@ -250,14 +250,14 @@
 	int i;
 	char **list;
 	G_verbose_message(_("Checking location <%s> mapset <%s>"),
-			  inlocation->answer, imapset->answer);
+			  inlocation->answer, setname);
 	list = G_list(G_ELEMENT_RASTER, G__getenv("GISDBASE"),
-		      G__getenv("LOCATION_NAME"), imapset->answer);
+		      G__getenv("LOCATION_NAME"), setname);
 	for (i = 0; list[i]; i++) {
 	    fprintf(stdout, "%s\n", list[i]);
 	}
 	fflush(stdout);
-	exit(EXIT_SUCCESS);	/* leave v.proj after listing */
+	exit(EXIT_SUCCESS);	/* leave r.proj after listing */
     }
 
     if (!inmap->answer)
@@ -284,7 +284,8 @@
     G_free_key_value(in_unit_info);
     G_free_key_value(out_proj_info);
     G_free_key_value(out_unit_info);
-    pj_print_proj_params(&iproj, &oproj);
+    if (G_verbose() > G_verbose_std())
+	pj_print_proj_params(&iproj, &oproj);
 
     /* this call causes r.proj to read the entire map into memeory */
     G_get_cellhd(inmap->answer, setname, &incellhd);