[GRASS-SVN] r55611 - in grass/trunk: general/g.proj raster/r.in.gdal vector/v.in.lidar vector/v.in.ogr

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-04-03 09:28:17 -0700 (Wed, 03 Apr 2013)
New Revision: 55611

Modified:
   grass/trunk/general/g.proj/create.c
   grass/trunk/raster/r.in.gdal/main.c
   grass/trunk/vector/v.in.lidar/main.c
   grass/trunk/vector/v.in.ogr/main.c
Log:
update several modules: G_make_location() doesn't call G_fatal_error()


Modified: grass/trunk/general/g.proj/create.c
===================================================================
--- grass/trunk/general/g.proj/create.c	2013-04-03 16:27:21 UTC (rev 55610)
+++ grass/trunk/general/g.proj/create.c	2013-04-03 16:28:17 UTC (rev 55611)
@@ -10,14 +10,14 @@
 {
     int ret;
 
-    ret = G__make_location(location, &cellhd, projinfo, projunits, NULL);
+    ret = G_make_location(location, &cellhd, projinfo, projunits);
     if (ret == 0)
 	G_message(_("Location <%s> created"), location);
     else if (ret == -1)
 	G_fatal_error(_("Unable to create location <%s>: %s"),
-		    location, strerror(errno));
+                      location, strerror(errno));
     else if (ret == -2)
-	G_fatal_error(_("Unable to create projection files: %s"),
+        G_fatal_error(_("Unable to create projection files: %s"),
 		    strerror(errno));
     else
 	/* Shouldn't happen */

Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2013-04-03 16:27:21 UTC (rev 55610)
+++ grass/trunk/raster/r.in.gdal/main.c	2013-04-03 16:28:17 UTC (rev 55611)
@@ -344,8 +344,11 @@
 			    "format; cannot create new location."));
 	}
 	else {
-	    G_make_location(parm.outloc->answer, &cellhd,
-			    proj_info, proj_units, NULL);
+            if (0 != G_make_location(parm.outloc->answer, &cellhd,
+                                     proj_info, proj_units)) {
+                G_fatal_error(_("Unable to create new location <%s>"),
+                              parm.outloc->answer);
+            }
 	    G_message(_("Location <%s> created"), parm.outloc->answer);
 	}
 

Modified: grass/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c	2013-04-03 16:27:21 UTC (rev 55610)
+++ grass/trunk/vector/v.in.lidar/main.c	2013-04-03 16:28:17 UTC (rev 55611)
@@ -339,8 +339,11 @@
 			    "format; cannot create new location."));
 	}
 	else {
-	    G_make_location(outloc_opt->answer, &cellhd,
-			    proj_info, proj_units, NULL);
+            if (0 != G_make_location(outloc_opt->answer, &cellhd,
+                                     proj_info, proj_units)) {
+                G_fatal_error(_("Unable to create new location <%s>"),
+                              outloc_opt->answer);
+            }
 	    G_message(_("Location <%s> created"), outloc_opt->answer);
 	}
 

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2013-04-03 16:27:21 UTC (rev 55610)
+++ grass/trunk/vector/v.in.ogr/main.c	2013-04-03 16:28:17 UTC (rev 55611)
@@ -614,8 +614,11 @@
 			    "format; cannot create new location."));
 	}
 	else {
-	    G_make_location(param.outloc->answer, &cellhd,
-			    proj_info, proj_units, NULL);
+            if (0 != G_make_location(param.outloc->answer, &cellhd,
+                                     proj_info, proj_units)) {
+                G_fatal_error(_("Unable to create new location <%s>"),
+                              param.outloc->answer);
+            }
 	    G_message(_("Location <%s> created"), param.outloc->answer);
 	}