[GRASS-CVS] carlos: grass6/raster/r.basins.fill main.c,2.7,2.8
grass at intevation.de
grass at intevation.de
Tue Nov 27 13:25:30 EST 2007
Author: carlos
Update of /grassrepository/grass6/raster/r.basins.fill
In directory doto:/tmp/cvs-serv22445/r.basins.fill
Modified Files:
main.c
Log Message:
Message standardization
Index: main.c
===================================================================
RCS file: /grassrepository/grass6/raster/r.basins.fill/main.c,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- main.c 13 Dec 2006 14:21:39 -0000 2.7
+++ main.c 27 Nov 2007 18:25:28 -0000 2.8
@@ -89,8 +89,7 @@
strcpy(drain_name, opt2->answer);
drain_mapset = G_find_cell2(drain_name, "");
if (drain_mapset == NULL)
- G_fatal_error(_("%s: <%s> raster map not found"),
- G_program_name(), opt2->answer);
+ G_fatal_error(_("Raster map <%s> not found"), opt2->answer);
/* this isn't a nice thing to do. G_align_window() should be used first */
G_get_cellhd (drain_name, drain_mapset, &window);
@@ -102,21 +101,19 @@
strcpy (ridge_name, opt3->answer);
ridge_mapset = G_find_cell2(ridge_name, "");
if (ridge_mapset == NULL)
- G_fatal_error(_("%s: <%s> raster map not found"),
- G_program_name(), opt3->answer);
+ G_fatal_error(_("Raster map <%s> not found"), opt3->answer);
strcpy (part_name, opt4->answer);
part_mapset = G_find_cell2(part_name,"");
if (part_mapset != NULL)
- G_fatal_error(_("%s: <%s> raster map exists already"),
- G_program_name(), opt4->answer);
+ G_fatal_error(_("Raster map <%s> already exists"), opt4->answer);
drain = read_map (drain_name, drain_mapset, NOMASK, nrows, ncols);
ridge = read_map (ridge_name, ridge_mapset, NOMASK, nrows, ncols);
partfd = G_open_cell_new (part_name);
if (partfd < 0)
- G_fatal_error (_("unable to create %s"), part_name);
+ G_fatal_error (_("Unable to create raster map <%s>"), part_name);
/* run through file and set streams to zero at locations where ridges exist*/
for (row = 0; row < nrows; row++)
@@ -140,7 +137,7 @@
}
}
}
- G_message(_("forward sweep complete"));
+ G_message(_("Forward sweep complete"));
for (row = nrows-3; row > 1; --row)
{
@@ -155,14 +152,14 @@
}
}
}
- G_message(_("reverse sweep complete"));
+ G_message(_("Reverse sweep complete"));
}
/* write out partitioned watershed map */
for (row = 0; row<nrows; row++)
G_put_raster_row (partfd, drain+(row*ncols), CELL_TYPE);
- G_message(_("creating support files for %s"), part_name);
+ G_message(_("Creating support files for <%s>..."), part_name);
G_close_cell (partfd);
exit(EXIT_SUCCESS);
More information about the grass-commit
mailing list