r.stream.*: trivial synchronization between cloned files

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@60127 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.stream.channel/io.c

@@ -76,9 +76,9 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
-	    G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
-                            "Run 'g.region rast=%s' to set proper region resolution."),
-			  input_map_name, input_map_name);
+          G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
+                          "Run 'g.region rast=%s' to set proper region resolution."),
+                        input_map_name, input_map_name);
 
     /* checking if input map is of required type */
     if (check_data_type != map->data_type)
@@ -294,7 +294,7 @@ int seg_create_map(SEG * seg, int srows, int scols, int number_of_segs,
 	seg->data_size = sizeof(DCELL);
 	break;
     default:
-	G_fatal_error(_("Unrecognisabe data type"));
+	G_fatal_error(_("Unrecognisable data type"));
     }
 
     filename = G_tempfile();
@@ -363,9 +363,9 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
-	    G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
-                            "Run 'g.region rast=%s' to set proper region resolution."),
-			  input_map_name, input_map_name);
+          G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
+                          "Run 'g.region rast=%s' to set proper region resolution."),
+                        input_map_name, input_map_name);
 
     if (check_data_type != seg->data_type)
 	G_debug(1,

raster/r.stream.channel/io.h

@@ -56,4 +56,3 @@ int seg_read_map(SEG *, char *, int, RASTER_MAP_TYPE);
 int seg_reset_map (SEG *, int);
 int seg_write_map(SEG *, char *, RASTER_MAP_TYPE, int, double);
 int seg_release_map(SEG *);
-

raster/r.stream.channel/stream_topology.c

@@ -49,9 +49,9 @@ int ram_trib_nums(int r, int c, CELL ** streams, CELL ** dirs)
 	}
 
     if (trib_num > 5)
-	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match..."));
+	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
     if (trib_num > 3)
-	G_warning(_("Stream network may be too dense..."));
+	G_warning(_("Stream network may be too dense"));
 
     return trib_num;
 }				/* end trib_num */
@@ -87,7 +87,7 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
 
     stream_attributes =
 	(STREAM *) G_malloc(number_of_streams * sizeof(STREAM));
-    G_message("Finding inits...");
+    G_message(_("Finding inits..."));
     SA = stream_attributes;
 
     for (r = 0; r < nrows; ++r)
@@ -95,7 +95,7 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
 	    if (streams[r][c])
 		if (ram_trib_nums(r, c, streams, dirs) != 1) {	/* adding inits */
 		    if (stream_num > number_of_streams)
-			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match..."));
+			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
 
 		    SA[stream_num].stream_num = stream_num;
 		    SA[stream_num].init_r = r;
@@ -170,7 +170,7 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
 	    SA[i].distance[cell_num] = get_distance(r, c, next_d);
 	    cell_num++;
 	    if (cell_num > SA[i].number_of_cells)
-		G_fatal_error(_("To much points in stream line..."));
+		G_fatal_error(_("To many points in stream line"));
 	} while (streams[r][c] == SA[i].order);
 
 	if (SA[i].elevation[0] == -99999)
@@ -180,26 +180,6 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
     return 0;
 }
 
-int ram_find_contributing_cell(int r, int c, CELL **dirs, FCELL **elevation)
-{
-    int i, j = 0;
-    int next_r, next_c;
-    float elev_min = 9999;
-
-    for (i = 1; i < 9; ++i) {
-	if (NOT_IN_REGION(i))
-	    continue;
-	next_r = NR(i);
-	next_c = NC(i);
-	if (dirs[next_r][next_c] == DIAG(i) &&
-	    elevation[next_r][next_c] < elev_min) {
-	    elev_min = elevation[next_r][next_c];
-	    j = i;
-	}
-    }
-
-    return j;
-}
 
 int seg_trib_nums(int r, int c, SEGMENT * streams, SEGMENT * dirs)
 {				/* calculate number of tributaries */
@@ -282,13 +262,15 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
     G_message("Finding inits...");
     SA = stream_attributes;
 
+    /* finding inits */
     for (r = 0; r < nrows; ++r)
 	for (c = 0; c < ncols; ++c) {
 	    segment_get(streams, &streams_cell, r, c);
+
 	    if (streams_cell)
 		if (seg_trib_nums(r, c, streams, dirs) != 1) {	/* adding inits */
 		    if (stream_num > number_of_streams)
-			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match..."));
+			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
 
 		    SA[stream_num].stream_num = stream_num;
 		    SA[stream_num].init_r = r;
@@ -296,6 +278,7 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 		}
 	}
 
+    /* building streamline */
     for (i = 1; i < stream_num; ++i) {
 
 	r = SA[i].init_r;
@@ -303,10 +286,11 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	segment_get(streams, &(SA[i].order), r, c);
 	//segment_get(streams,&streams_cell,r,c);
 	SA[i].number_of_cells = 0;
-	do {
 
+	do {
 	    SA[i].number_of_cells++;
 	    segment_get(dirs, &dirs_cell, r, c);
+
 	    d = abs(dirs_cell);
 	    if (NOT_IN_REGION(d) || d == 0)
 		break;
@@ -358,6 +342,7 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	do {
 	    segment_get(dirs, &dirs_cell, r, c);
 	    d = abs(dirs_cell);
+
 	    if (NOT_IN_REGION(d) || d == 0) {
 		SA[i].points[cell_num] = -1;
 		SA[i].distance[cell_num] = SA[i].distance[cell_num - 1];
@@ -386,6 +371,27 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
     return 0;
 }
 
+int ram_find_contributing_cell(int r, int c, CELL **dirs, FCELL **elevation)
+{
+    int i, j = 0;
+    int next_r, next_c;
+    float elev_min = 9999;
+
+    for (i = 1; i < 9; ++i) {
+	if (NOT_IN_REGION(i))
+	    continue;
+	next_r = NR(i);
+	next_c = NC(i);
+	if (dirs[next_r][next_c] == DIAG(i) &&
+	    elevation[next_r][next_c] < elev_min) {
+	    elev_min = elevation[next_r][next_c];
+	    j = i;
+	}
+    }
+
+    return j;
+}
+
 int seg_find_contributing_cell(int r, int c, SEGMENT *dirs,
 			       SEGMENT *elevation)
 {

raster/r.stream.distance/io.c

@@ -14,7 +14,7 @@ int ram_create_map(MAP * map, RASTER_MAP_TYPE data_type)
     int r;
 
     if (data_type < 0 || data_type > 2)
-	G_fatal_error(_("Unable to create map of unrecognised type"));
+	G_fatal_error(_("Unable to create raster map of unrecognised type"));
 
     map->data_type = data_type;
     map->map_name = NULL;
@@ -47,10 +47,10 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
 		 RASTER_MAP_TYPE check_data_type)
 {
     /*
-     * Funciton read external map and put it in MAP structure (created with create_map)
-     * map: map to be read can be of any data type, read map is converted to target map if neccesary.
+     * Function read external map and put it in MAP structure (created with create_map)
+     * map: map to be read can be of any data type, read map is converted to target map if necessary.
      * input_map_name: name of the map to be read;
-     * map pointer to map stucture (created with create_map);
+     * map pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -218,7 +218,7 @@ int ram_write_map(MAP * map, char *output_map_name,
 			Rast_set_d_null_value(row + c * (map->data_size), 1);
 		break;
 	    default:
-		G_debug(1, "Cannot Cannot convert to null at: %d %d", r, c);
+		G_debug(1, "ram_null:Cannot convert to null at: %d %d", r, c);
 	    }
 	}
 
@@ -329,10 +329,10 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 {
 
     /*
-     * Funciton read external map and put it in SEG structure (created with seg_create_map)
-     * map to be read can be of any data type, read map is converted if neccesary.
+     * Function read external map and put it in SEG structure (created with seg_create_map)
+     * map to be read can be of any data type, read map is converted if necessary.
      * input_map_name: name of the map to be read;
-     * seg: pointer to map stucture (created with create_map);
+     * seg: pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -359,21 +359,21 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     G_get_window(&this_window);
     Rast_get_cellhd(input_map_name, mapset, &cellhd);
 
-    /* check resolution equal anyinteger check;  equal 0 no check */
+    /* check resolution equal any integer check;  equal 0 no check */
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
-	    G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
-                            "Run 'g.region rast=%s' to set proper region resolution."),
-			  input_map_name, input_map_name);
-    
+          G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
+                          "Run 'g.region rast=%s' to set proper region resolution."),
+                        input_map_name, input_map_name);
+
     if (check_data_type != seg->data_type)
 	G_debug(1,
 		"ram_open:required map type and internal map type differs: conversion forced!");
     input_data_type = Rast_map_type(input_map_name, mapset);
     if (check_data_type != -1)
 	if (input_data_type != check_data_type)
-	    G_fatal_error(_("Raster <%s> is not of type '%s'"),
+	    G_fatal_error(_("Raster map <%s> is not of type '%s'"),
 			  input_map_name, maptypes[check_data_type]);
 
     input_fd = Rast_open_old(input_map_name, mapset);
@@ -528,8 +528,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
 			Rast_set_d_null_value(row + c * (seg->data_size), 1);
 		break;
 	    default:
-		G_warning(_("Unable to convert to NULL at: %d %d"), r,
-			  c);
+		G_warning(_("Unable to convert to NULL at: %d %d"), r, c);
 	    }
 	}
 	Rast_put_row(output_fd, output_buffer, output_data_type);

raster/r.stream.distance/io.h

@@ -22,7 +22,7 @@
 
 typedef struct {
 	void **map; /* matrix of data */
-	double min, max; /* data range : may requre casting */
+	double min, max; /* data range : may require casting */
 	int nrows, ncols;
 	char *map_name; /* map name, unused */
 	RASTER_MAP_TYPE data_type; /* type of data */

raster/r.stream.order/io.c

@@ -47,10 +47,10 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
 		 RASTER_MAP_TYPE check_data_type)
 {
     /*
-     * Funciton read external map and put it in MAP structure (created with create_map)
-     * map: map to be read can be of any data type, read map is converted to target map if neccesary.
+     * Function read external map and put it in MAP structure (created with create_map)
+     * map: map to be read can be of any data type, read map is converted to target map if necessary.
      * input_map_name: name of the map to be read;
-     * map pointer to map stucture (created with create_map);
+     * map pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -79,7 +79,7 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
           G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
                           "Run 'g.region rast=%s' to set proper region resolution."),
                         input_map_name, input_map_name);
-    
+
     /* checking if input map is of required type */
     if (check_data_type != map->data_type)
 	G_debug(1,
@@ -218,7 +218,7 @@ int ram_write_map(MAP * map, char *output_map_name,
 			Rast_set_d_null_value(row + c * (map->data_size), 1);
 		break;
 	    default:
-		G_debug(1, "Unable to convert to NULL at: %d %d", r, c);
+		G_debug(1, "ram_null:Cannot convert to null at: %d %d", r, c);
 	    }
 	}
 
@@ -294,7 +294,7 @@ int seg_create_map(SEG * seg, int srows, int scols, int number_of_segs,
 	seg->data_size = sizeof(DCELL);
 	break;
     default:
-	G_fatal_error(_("Uunrecognisable data type"));
+	G_fatal_error(_("Unrecognisable data type"));
     }
 
     filename = G_tempfile();
@@ -311,7 +311,7 @@ int seg_create_map(SEG * seg, int srows, int scols, int number_of_segs,
     close(fd);
     if (0 > (fd = open(filename, 2))) {
 	unlink(filename);
-	G_fatal_error(_("Unable re-open file '%s'"), filename);
+	G_fatal_error(_("Unable to re-open file '%s'"), filename);
     }
 
     if (0 > (fd = segment_init(&(seg->seg), fd, number_of_segs))) {
@@ -329,10 +329,10 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 {
 
     /*
-     * Funciton read external map and put it in SEG structure (created with seg_create_map)
-     * map to be read can be of any data type, read map is converted if neccesary.
+     * Function read external map and put it in SEG structure (created with seg_create_map)
+     * map to be read can be of any data type, read map is converted if necessary.
      * input_map_name: name of the map to be read;
-     * seg: pointer to map stucture (created with create_map);
+     * seg: pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -359,14 +359,14 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     G_get_window(&this_window);
     Rast_get_cellhd(input_map_name, mapset, &cellhd);
 
-    /* check resolution equal anyinteger check;  equal 0 no check */
+    /* check resolution equal any integer check;  equal 0 no check */
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
-            G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
-                            "Run 'g.region rast=%s' to set proper region resolution."),
-                          input_map_name, input_map_name);
-    
+          G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
+                          "Run 'g.region rast=%s' to set proper region resolution."),
+                        input_map_name, input_map_name);
+
     if (check_data_type != seg->data_type)
 	G_debug(1,
 		"ram_open:required map type and internal map type differs: conversion forced!");
@@ -528,8 +528,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
 			Rast_set_d_null_value(row + c * (seg->data_size), 1);
 		break;
 	    default:
-		G_warning(_("Unable to convert to NULL at: %d %d"), r,
-			  c);
+		G_warning(_("Unable to convert to NULL at: %d %d"), r, c);
 	    }
 	}
 	Rast_put_row(output_fd, output_buffer, output_data_type);

raster/r.stream.order/io.h

@@ -22,7 +22,7 @@
 
 typedef struct {
 	void **map; /* matrix of data */
-	double min, max; /* data range : may requre casting */
+	double min, max; /* data range : may require casting */
 	int nrows, ncols;
 	char *map_name; /* map name, unused */
 	RASTER_MAP_TYPE data_type; /* type of data */

raster/r.stream.segment/io.c

@@ -365,7 +365,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 	    this_window.ns_res != cellhd.ns_res)
           G_fatal_error(_("Region resolution and raster map <%s> resolution differs. "
                           "Run 'g.region rast=%s' to set proper region resolution."),
-			  input_map_name, input_map_name);
+                        input_map_name, input_map_name);
 
     if (check_data_type != seg->data_type)
 	G_debug(1,
@@ -441,7 +441,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 	    G_free(input_buffer);
 	    G_free(target_buffer);
 	    Rast_close(input_fd);
-	    G_fatal_error(_("seg_read: Cannot segment put row %d for map %s"),
+	    G_fatal_error(_("Unable to segment put row %d for raster map <%s>"),
 			  r, input_map_name);
 	}
     }				/* end for row */
@@ -528,8 +528,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
 			Rast_set_d_null_value(row + c * (seg->data_size), 1);
 		break;
 	    default:
-		G_warning(_("Unable to convert to NULL at: %d %d"), r,
-			  c);
+		G_warning(_("Unable to convert to NULL at: %d %d"), r, c);
 	    }
 	}
 	Rast_put_row(output_fd, output_buffer, output_data_type);

raster/r.stream.segment/stream_topology.c

@@ -1,4 +1,5 @@
 #include "local_proto.h"
+
 double get_distance(int r, int c, int d)
 {
     double northing, easting, next_northing, next_easting;
@@ -10,6 +11,7 @@ double get_distance(int r, int c, int d)
     easting = window.west + (c + .5) * window.ew_res;
     next_northing = window.north - (next_r + .5) * window.ns_res;
     next_easting = window.west + (next_c + .5) * window.ew_res;
+
     return G_distance(easting, northing, next_easting, next_northing);
 }
 
@@ -47,7 +49,7 @@ int ram_trib_nums(int r, int c, CELL ** streams, CELL ** dirs)
 	}
 
     if (trib_num > 5)
-	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match."));
+	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
     if (trib_num > 3)
 	G_warning(_("Stream network may be too dense"));
 
@@ -96,7 +98,7 @@ int seg_trib_nums(int r, int c, SEGMENT *streams, SEGMENT *dirs)
 	}
 
     if (trib_num > 5)
-	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match."));
+	G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
     if (trib_num > 3)
 	G_warning(_("Stream network may be too dense"));
 
@@ -172,7 +174,7 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
 	    if (streams[r][c])
 		if (ram_trib_nums(r, c, streams, dirs) != 1) {	/* adding inits */
 		    if (stream_num > number_of_streams)
-			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match."));
+			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
 
 		    SA[stream_num].stream = stream_num;
 		    SA[stream_num].init = INDEX(r, c);
@@ -251,12 +253,13 @@ int ram_build_streamlines(CELL **streams, CELL **dirs, FCELL **elevation,
 	    SA[i].distance[cell_num] = get_distance(r, c, next_d);
 	    cell_num++;
 	    if (cell_num > SA[i].number_of_cells)
-		G_fatal_error(_("To much points in stream line"));
+		G_fatal_error(_("To many points in stream line"));
 	} while (streams[r][c] == SA[i].order);
 
 	if (SA[i].elevation[0] == -99999)
 	    SA[i].elevation[0] = 2 * SA[i].elevation[1] - SA[i].elevation[2];
     }
+
     return 0;
 }
 
@@ -288,7 +291,7 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	    if (streams_cell)
 		if (seg_trib_nums(r, c, streams, dirs) != 1) {	/* adding inits */
 		    if (stream_num > number_of_streams)
-			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match."));
+			G_fatal_error(_("Error finding inits. Stream and direction maps probably do not match"));
 
 		    SA[stream_num].stream = stream_num;
 		    SA[stream_num].init = INDEX(r, c);
@@ -306,7 +309,6 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	SA[i].number_of_cells = 0;
 
 	do {
-
 	    SA[i].number_of_cells++;
 	    segment_get(dirs, &dirs_cell, r, c);
 
@@ -388,6 +390,7 @@ int seg_build_streamlines(SEGMENT *streams, SEGMENT *dirs,
 	if (SA[i].elevation[0] == -99999)
 	    SA[i].elevation[0] = 2 * SA[i].elevation[1] - SA[i].elevation[2];
     }
+
     return 0;
 }
 

raster/r.stream.snap/io.c

@@ -47,13 +47,13 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
 		 RASTER_MAP_TYPE check_data_type)
 {
     /*
-     * Funciton read external map and put it in MAP structure (created with create_map)
-     * map: map to be read can be of any data type, read map is converted to target map if neccesary.
+     * Function read external map and put it in MAP structure (created with create_map)
+     * map: map to be read can be of any data type, read map is converted to target map if necessary.
      * input_map_name: name of the map to be read;
-     * map pointer to map stucture (created with create_map);
+     * map pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
-5     */
+     */
 
     int r, c;
     char *mapset;
@@ -329,10 +329,10 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 {
 
     /*
-     * Funciton read external map and put it in SEG structure (created with seg_create_map)
-     * map to be read can be of any data type, read map is converted if neccesary.
+     * Function read external map and put it in SEG structure (created with seg_create_map)
+     * map to be read can be of any data type, read map is converted if necessary.
      * input_map_name: name of the map to be read;
-     * seg: pointer to map stucture (created with create_map);
+     * seg: pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -359,7 +359,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     G_get_window(&this_window);
     Rast_get_cellhd(input_map_name, mapset, &cellhd);
 
-    /* check resolution equal anyinteger check;  equal 0 no check */
+    /* check resolution equal any integer check;  equal 0 no check */
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
@@ -528,8 +528,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
 			Rast_set_d_null_value(row + c * (seg->data_size), 1);
 		break;
 	    default:
-		G_warning(_("Unable to convert to NULL at: %d %d"), r,
-			  c);
+		G_warning(_("Unable to convert to NULL at: %d %d"), r, c);
 	    }
 	}
 	Rast_put_row(output_fd, output_buffer, output_data_type);
@@ -541,7 +540,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
     Rast_short_history(output_map_name, "raster", &history);
     Rast_command_history(&history);
     Rast_write_history(output_map_name, &history);
-    /*G_message(_("%s Done"), output_map_name); */
+    /* G_message(_("%s Done"), output_map_name); */
 
     return 0;
 }

raster/r.stream.snap/io.h

@@ -22,7 +22,7 @@
 
 typedef struct {
 	void **map; /* matrix of data */
-	double min, max; /* data range : may requre casting */
+	double min, max; /* data range : may require casting */
 	int nrows, ncols;
 	char *map_name; /* map name, unused */
 	RASTER_MAP_TYPE data_type; /* type of data */

raster/r.stream.stats/io.c

@@ -47,10 +47,10 @@ int ram_read_map(MAP * map, char *input_map_name, int check_res,
 		 RASTER_MAP_TYPE check_data_type)
 {
     /*
-     * Funciton read external map and put it in MAP structure (created with create_map)
-     * map: map to be read can be of any data type, read map is converted to target map if neccesary.
+     * Function read external map and put it in MAP structure (created with create_map)
+     * map: map to be read can be of any data type, read map is converted to target map if necessary.
      * input_map_name: name of the map to be read;
-     * map pointer to map stucture (created with create_map);
+     * map pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -229,7 +229,7 @@ int ram_write_map(MAP * map, char *output_map_name,
     Rast_short_history(output_map_name, "raster", &history);
     Rast_command_history(&history);
     Rast_write_history(output_map_name, &history);
-    /*G_message(_("<%s> Done"), output_map_name); */
+    /* G_message(_("<%s> Done"), output_map_name); */
     return 0;
 }
 
@@ -329,10 +329,10 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 {
 
     /*
-     * Funciton read external map and put it in SEG structure (created with seg_create_map)
-     * map to be read can be of any data type, read map is converted if neccesary.
+     * Function read external map and put it in SEG structure (created with seg_create_map)
+     * map to be read can be of any data type, read map is converted if necessary.
      * input_map_name: name of the map to be read;
-     * seg: pointer to map stucture (created with create_map);
+     * seg: pointer to map structure (created with create_map);
      * check_res: [1]: check res correspondence between region and map [0 no check];
      * check_data_type [CELL, FCELL, DCELL] check if reading map is of particular type, [-1] no check;
      */
@@ -359,7 +359,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     G_get_window(&this_window);
     Rast_get_cellhd(input_map_name, mapset, &cellhd);
 
-    /* check resolution equal anyinteger check;  equal 0 no check */
+    /* check resolution equal any integer check;  equal 0 no check */
     if (check_res)
 	if (this_window.ew_res != cellhd.ew_res ||
 	    this_window.ns_res != cellhd.ns_res)
@@ -373,7 +373,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
     input_data_type = Rast_map_type(input_map_name, mapset);
     if (check_data_type != -1)
 	if (input_data_type != check_data_type)
-	    G_fatal_error(_("Raster <%s> is not of type '%s'"),
+	    G_fatal_error(_("Raster map <%s> is not of type '%s'"),
 			  input_map_name, maptypes[check_data_type]);
 
     input_fd = Rast_open_old(input_map_name, mapset);
@@ -441,7 +441,7 @@ int seg_read_map(SEG * seg, char *input_map_name, int check_res,
 	    G_free(input_buffer);
 	    G_free(target_buffer);
 	    Rast_close(input_fd);
-	    G_fatal_error(_("seg_read: Cannot segment put row %d for map %s"),
+	    G_fatal_error(_("Unable to segment put row %d for raster map <%s>"),
 			  r, input_map_name);
 	}
     }				/* end for row */
@@ -528,8 +528,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
 			Rast_set_d_null_value(row + c * (seg->data_size), 1);
 		break;
 	    default:
-		G_warning(_("ram_null:Cannot convert to null at: %d %d"), r,
-			  c);
+		G_warning(_("Unable to convert to NULL at: %d %d"), r, c);
 	    }
 	}
 	Rast_put_row(output_fd, output_buffer, output_data_type);
@@ -541,7 +540,7 @@ int seg_write_map(SEG * seg, char *output_map_name,
     Rast_short_history(output_map_name, "raster", &history);
     Rast_command_history(&history);
     Rast_write_history(output_map_name, &history);
-    /*G_message(_("%s Done"), output_map_name); */
+    /* G_message(_("%s Done"), output_map_name); */
 
     return 0;
 }

raster/r.stream.stats/io.h

@@ -22,7 +22,7 @@
 
 typedef struct {
 	void **map; /* matrix of data */
-	double min, max; /* data range : may requre casting */
+	double min, max; /* data range : may require casting */
 	int nrows, ncols;
 	char *map_name; /* map name, unused */
 	RASTER_MAP_TYPE data_type; /* type of data */