Rast_close, Rast_unopen, Rast_get_cellhd now generate errors rather than returning a status

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40217 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.rast.arrow/main.c

@@ -231,8 +231,7 @@ int main(int argc, char **argv)
     if (align->answer) {
 	struct Cell_head wind;
 
-	if (Rast_get_cellhd(layer_name, "", &wind) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s>"), layer_name);
+	Rast_get_cellhd(layer_name, "", &wind);
 
 	/* expand window extent by one wind resolution */
 	wind.west += wind.ew_res * ((int)((window.west - wind.west) / wind.ew_res) - (window.west < wind.west));

display/d.rast.num/main.c

@@ -139,8 +139,7 @@ int main(int argc, char **argv)
     if (align->answer) {
 	struct Cell_head wind;
 
-	if (Rast_get_cellhd(map_name, "", &wind) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s>"), map_name);
+	Rast_get_cellhd(map_name, "", &wind);
 
 	/* expand window extent by one wind resolution */
 	wind.west += wind.ew_res * ((int)((window.west - wind.west) / wind.ew_res) - (window.west < wind.west));

display/d.title/main.c

@@ -103,9 +103,7 @@ int main(int argc, char **argv)
     if (!strlen(map_name))
 	G_fatal_error(_("No map name given"));
 
-    if (Rast_get_cellhd(map_name, "", &window) == -1)
-	G_fatal_error(_("Unable to read header of raster map <%s>"),
-		      map_name);
+    Rast_get_cellhd(map_name, "", &window);
 
     if (Rast_read_cats(map_name, "", &cats) == -1)
 	G_fatal_error(_("Unable to read category file of raster map <%s>"),

display/d.zoom/main.c

@@ -137,7 +137,8 @@ int main(int argc, char **argv)
 	nrasts = i;
 
 	for (i = 0; i < nrasts; i++) {
-	    if (Rast_get_cellhd(rast[i], "", &window) >= 0) {
+	    Rast_get_cellhd(rast[i], "", &window);
+	    {
 		if (first) {
 		    first = 0;
 		    U_east = window.east;

doc/raster/r.example/main.c

@@ -111,8 +111,7 @@ int main(int argc, char *argv[])
     infd = Rast_open_old(name, mapset);
 
     /* controlling, if we can open input raster */
-    if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	G_fatal_error(_("Unable to read file header of <%s>"), name);
+    Rast_get_cellhd(name, mapset, &cellhd);
 
     G_debug(3, "number of rows %d", cellhd.rows);
 

general/g.region/main.c

@@ -453,9 +453,7 @@ int main(int argc, char *argv[])
 	    mapset = G_find_raster2(rast_name, "");
 	    if (!mapset)
 		G_fatal_error(_("Raster map <%s> not found"), rast_name);
-	    if (Rast_get_cellhd(rast_name, mapset, &temp_window) < 0)
-		G_fatal_error(_("Unable to read header of raster map <%s@%s>"),
-			      rast_name, mapset);
+	    Rast_get_cellhd(rast_name, mapset, &temp_window);
 	    if (!first) {
 		G_copy(&window, &temp_window, sizeof(window));
 		first = 1;
@@ -787,9 +785,7 @@ int main(int argc, char *argv[])
 	mapset = G_find_raster2(name, "");
 	if (!mapset)
 	    G_fatal_error(_("Raster map <%s> not found"), name);
-	if (Rast_get_cellhd(name, mapset, &temp_window) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s@%s>"),
-			  name, mapset);
+	Rast_get_cellhd(name, mapset, &temp_window);
 	if ((err = G_align_window(&window, &temp_window)))
 	    G_fatal_error(_("Raster map <%s@%s>: %s"), name, mapset, err);
     }

imagery/i.albedo/main.c

@@ -154,8 +154,7 @@ int main(int argc, char *argv[])
 	in_data_type[nfiles] = Rast_map_type(name, "");
 	infd[nfiles] = Rast_open_old(name, "");
 
-	if ((Rast_get_cellhd(name, "", &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+	Rast_get_cellhd(name, "", &cellhd);
 
 	inrast[nfiles] = Rast_allocate_buf(in_data_type[nfiles]);
 	nfiles++;

imagery/i.class/main.c

@@ -161,8 +161,7 @@ int main(int argc, char *argv[])
     display_title(VIEW_MAP1);
 
     mapset = G_find_raster(bg_map->answer, "");
-    if (Rast_get_cellhd(bg_map->answer, mapset, &cellhd) != 0)
-	G_fatal_error(_("Raster map <%s> not found"), bg_map->answer);
+    Rast_get_cellhd(bg_map->answer, mapset, &cellhd);
 
     G_adjust_window_to_box(&cellhd, &VIEW_MAP1->cell.head, VIEW_MAP1->nrows,
 			   VIEW_MAP1->ncols);
@@ -265,9 +264,7 @@ static int check_files(char *img_group, char *img_subgroup,
 	G_fatal_error(_("The subgroup must have at least 2 files to run"));
     }
 
-    if (Rast_get_cellhd(Refer.file[0].name, Refer.file[0].mapset, &Band_cellhd)
-	!= 0)
-	G_fatal_error(_("Unable to read cell header for first band file"));
+    Rast_get_cellhd(Refer.file[0].name, Refer.file[0].mapset, &Band_cellhd);
 
     /* allocate space for signature routines */
     init_sig_routines((size_t) Refer.nfiles);

imagery/i.class/signature.c

@@ -304,8 +304,8 @@ int display_signature(void)
     Rast_write_colors(MASK, G_mapset(), &mask_colors);
 
     /* display new mask */
-    if (Rast_get_cellhd(MASK, G_mapset(), &cellhd) != 0)
-	G_fatal_error(_("Did not find input cell map MASK."));
+    Rast_get_cellhd(MASK, G_mapset(), &cellhd);
+
     G_adjust_window_to_box(&cellhd, &VIEW_MASK1->cell.head, VIEW_MASK1->nrows,
 			   VIEW_MASK1->ncols);
     draw_cell(VIEW_MASK1, OVER_LAY);

imagery/i.eb.h_SEBAL01/main.c

@@ -209,14 +209,10 @@ int main(int argc, char *argv[])
     infd_z0m = Rast_open_old(z0m, "");
     infd_t0dem = Rast_open_old(t0dem, "");
 
-    if (Rast_get_cellhd(Rn, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), Rn);
-    if (Rast_get_cellhd(g0, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), g0);
-    if (Rast_get_cellhd(z0m, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), z0m);
-    if (Rast_get_cellhd(t0dem, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), t0dem);
+    Rast_get_cellhd(Rn, "", &cellhd);
+    Rast_get_cellhd(g0, "", &cellhd);
+    Rast_get_cellhd(z0m, "", &cellhd);
+    Rast_get_cellhd(t0dem, "", &cellhd);
 
     /* Allocate input buffer */
     inrast_Rn = Rast_allocate_d_buf();
@@ -243,8 +239,7 @@ int main(int argc, char *argv[])
     /***************************************************/
     outrast = Rast_allocate_d_buf();
 
-    if ((outfd = Rast_open_new(h0, DCELL_TYPE)) < 0)
-	G_fatal_error(_("Unable to create raster map <%s>"), h0);
+    outfd = Rast_open_new(h0, DCELL_TYPE);
 
     /***************************************************/
     /* Allocate memory for temporary images            */

imagery/i.evapo.time_integration/main.c

@@ -168,8 +168,7 @@ int main(int argc, char *argv[])
 	/* Allocate input buffer */
 	in_data_type[nfiles] = Rast_map_type(name, mapset);
 	infd[nfiles] = Rast_open_old(name, mapset);
-	if ((Rast_get_cellhd(name, mapset, &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name);
+	Rast_get_cellhd(name, mapset, &cellhd);
 	inrast[nfiles] = Rast_allocate_buf(in_data_type[nfiles]);
 	nfiles++;
     }
@@ -195,8 +194,7 @@ int main(int argc, char *argv[])
 	/* Allocate input buffer */
 	in_data_type1[nfiles1] = Rast_map_type(name1, mapset);
 	infd1[nfiles1] = Rast_open_old(name1, mapset);
-	if ((Rast_get_cellhd(name1, mapset, &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name1);
+	Rast_get_cellhd(name1, mapset, &cellhd);
 	inrast1[nfiles1] = Rast_allocate_buf(in_data_type1[nfiles1]);
 	nfiles1++;
     }
@@ -228,8 +226,7 @@ int main(int argc, char *argv[])
 	/* Allocate input buffer */
 	in_data_type2[nfiles2] = Rast_map_type(name2, mapset);
 	infd2[nfiles2] = Rast_open_old(name2, mapset);
-	if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0)
-	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name2);
+	Rast_get_cellhd(name2, mapset, &cellhd);
 	inrast2[nfiles2] = Rast_allocate_d_buf();
 	nfiles2++;
     }

imagery/i.latlong/main.c

@@ -79,8 +79,7 @@ int main(int argc, char *argv[])
 
     /***************************************************/ 
     infd = Rast_open_old(in, "");
-    if (Rast_get_cellhd(in, "", &cellhd) < 0)
-	G_fatal_error(_("Cannot read file header of [%s])"), in);
+    Rast_get_cellhd(in, "", &cellhd);
     inrast = Rast_allocate_d_buf();
     
     /***************************************************/ 

imagery/i.modis.qc/main.c

@@ -199,8 +199,7 @@ int main(int argc, char *argv[])
 
     infd = Rast_open_old(qcchan, "");
 
-    if (Rast_get_cellhd(qcchan, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s> "), qcchan);
+    Rast_get_cellhd(qcchan, "", &cellhd);
 
     inrast = Rast_allocate_c_buf();
 

imagery/i.points/cell.c

@@ -41,8 +41,7 @@ static int plot(int x, int y)
     if (x > VIEW_MAP1->left && x < VIEW_MAP1->right) {
 	if (!choose_groupfile(name, mapset))
 	    return 1;
-	if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	    return 1;
+	Rast_get_cellhd(name, mapset, &cellhd);
 
 	Erase_view(VIEW_MAP1_ZOOM);
 	VIEW_MAP1_ZOOM->cell.configured = 0;
@@ -57,10 +56,7 @@ static int plot(int x, int y)
 	    return 1;
 	select_target_env();
 
-	if (Rast_get_cellhd(name, mapset, &cellhd) < 0) {
-	    select_current_env();
-	    return 1;
-	}
+	Rast_get_cellhd(name, mapset, &cellhd);
 
 	Erase_view(VIEW_MAP2_ZOOM);
 	VIEW_MAP2_ZOOM->cell.configured = 0;

imagery/i.points/main.c

@@ -185,7 +185,8 @@ int main(int argc, char *argv[])
 	    quit(0);
 	/* display this file in "map1" */
     }
-    while (Rast_get_cellhd(name, mapset, &cellhd) < 0);
+    while (!G_find_raster2(name, mapset));
+    Rast_get_cellhd(name, mapset, &cellhd);
     G_adjust_window_to_box(&cellhd, &VIEW_MAP1->cell.head, VIEW_MAP1->nrows,
 			   VIEW_MAP1->ncols);
     Configure_view(VIEW_MAP1, name, mapset, cellhd.ns_res, cellhd.ew_res);

imagery/i.rectify/main.c

@@ -191,18 +191,11 @@ int main(int argc, char *argv[])
     }
     else {
 	/* Calculate smallest region */
-	if (a->answer) {
-	    if (Rast_get_cellhd(ref.file[0].name, ref.file[0].mapset, &cellhd) <
-		0)
-		G_fatal_error(_("Unable to read header of raster map <%s>"),
-			      ref.file[0].name);
-	}
-	else {
-	    if (Rast_get_cellhd(ifile->answers[0], ref.file[0].mapset, &cellhd) <
-		0)
-		G_fatal_error(_("Unable to read header of raster map <%s>"),
-			      ifile->answers[0]);
-	}
+	if (a->answer)
+	    Rast_get_cellhd(ref.file[0].name, ref.file[0].mapset, &cellhd);
+	else
+	    Rast_get_cellhd(ifile->answers[0], ref.file[0].mapset, &cellhd);
+
 	georef_window(&cellhd, &target_window, order);
     }
 

imagery/i.rectify/rectify.c

@@ -20,8 +20,7 @@ int rectify(char *name, char *mapset, char *result, int order)
     void *rast;
 
     select_current_env();
-    if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	return 0;
+    Rast_get_cellhd(name, mapset, &cellhd);
 
     /* open the result file into target window
      * this open must be first since we change the window later

imagery/i.vpoints/cell.c

@@ -41,8 +41,7 @@ static int plot(int x, int y)
     if (x > VIEW_MAP1->left && x < VIEW_MAP1->right) {
 	if (!choose_groupfile(name, mapset))
 	    return 1;
-	if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	    return 1;
+	Rast_get_cellhd(name, mapset, &cellhd);
 
 	Erase_view(VIEW_MAP1_ZOOM);
 	VIEW_MAP1_ZOOM->cell.configured = 0;
@@ -57,10 +56,7 @@ static int plot(int x, int y)
 	    return 1;
 	select_target_env();
 
-	if (Rast_get_cellhd(name, mapset, &cellhd) < 0) {
-	    select_current_env();
-	    return 1;
-	}
+	Rast_get_cellhd(name, mapset, &cellhd);
 
 	Erase_view(VIEW_MAP2_ZOOM);
 	VIEW_MAP2_ZOOM->cell.configured = 0;

imagery/i.vpoints/main.c

@@ -181,7 +181,8 @@ int main(int argc, char *argv[])
 	    quit(0);
 	/* display this file in "map1" */
     }
-    while (Rast_get_cellhd(name, mapset, &cellhd) < 0);
+    while (!G_find_raster2(name, mapset));
+    Rast_get_cellhd(name, mapset, &cellhd);
 
     G_adjust_window_to_box(&cellhd, &VIEW_MAP1->cell.head, VIEW_MAP1->nrows,
 			   VIEW_MAP1->ncols);

include/rasterdefs.h

@@ -82,8 +82,8 @@ int Rast_cell_stats_histo_eq(struct Cell_stats *, CELL, CELL, CELL, CELL, int,
 			  void (*)(CELL, CELL, CELL));
 
 /* closecell.c */
-int Rast_close(int);
-int Rast_unopen(int);
+void Rast_close(int);
+void Rast_unopen(int);
 
 /* color_compat.c */
 void Rast_make_ryg_colors(struct Colors *, CELL, CELL);
@@ -294,7 +294,7 @@ void Rast_close_gdal_link(struct GDAL_link *);
 int Rast_close_gdal_write_link(struct GDAL_link *);
 
 /* get_cellhd.c */
-int Rast_get_cellhd(const char *, const char *, struct Cell_head *);
+void Rast_get_cellhd(const char *, const char *, struct Cell_head *);
 
 /* get_row.c */
 int Rast_get_row_nomask(int, void *, int, RASTER_MAP_TYPE);

lib/gpde/N_arrays_io.c

@@ -154,8 +154,7 @@ N_array_2d *N_read_rast_to_array_2d(char *name, N_array_2d * array)
     }
 
     /* Close file */
-    if (Rast_close(map) < 0)
-	G_fatal_error(_("Unable to close input map"));
+    Rast_close(map);
 
     return data;
 }
@@ -234,11 +233,7 @@ void N_write_array_2d_to_rast(N_array_2d * array, char *name)
     }
 
     /* Close file */
-    if (Rast_close(map) < 0)
-	G_fatal_error(_("Unable to close input map"));
-
-    return;
-
+    Rast_close(map);
 }
 
 

lib/raster/auto_mask.c

@@ -55,11 +55,10 @@ int Rast__check_for_auto_masking(void)
 	return 0;
 
     /* check MASK projection/zone against current region */
-    if (Rast_get_cellhd("MASK", G_mapset(), &cellhd) >= 0) {
-	if (cellhd.zone != G_zone() || cellhd.proj != G_projection()) {
-	    R__.auto_mask = 0;
-	    return 0;
-	}
+    Rast_get_cellhd("MASK", G_mapset(), &cellhd);
+    if (cellhd.zone != G_zone() || cellhd.proj != G_projection()) {
+	R__.auto_mask = 0;
+	return 0;
     }
 
     Rast_unopen(R__.mask_fd);

lib/raster/closecell.c

@@ -67,16 +67,17 @@ static int write_fp_format(int fd);
  * \return -1 on error
  * \return 1 on success
  */
-int Rast_close(int fd)
+void Rast_close(int fd)
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
 
     if (fd < 0 || fd >= R__.fileinfo_count || fcb->open_mode <= 0)
-	return -1;
-    if (fcb->open_mode == OPEN_OLD)
-	return close_old(fd);
+	G_fatal_error(_("Invalid descriptor: %d"), fd);
 
-    return close_new(fd, 1);
+    if (fcb->open_mode == OPEN_OLD)
+	close_old(fd);
+    else
+	close_new(fd, 1);
 }
 
 /*!
@@ -100,16 +101,17 @@ int Rast_close(int fd)
  * \return -1 on error
  * \return 1 on success
  */
-int Rast_unopen(int fd)
+void Rast_unopen(int fd)
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
 
     if (fd < 0 || fd >= R__.fileinfo_count || fcb->open_mode <= 0)
-	return -1;
+	G_fatal_error(_("Invalid descriptor: %d"), fd);
+
     if (fcb->open_mode == OPEN_OLD)
-	return close_old(fd);
+	close_old(fd);
     else
-	return close_new(fd, 0);
+	close_new(fd, 0);
 }
 
 static int close_old(int fd)

lib/raster/get_cellhd.c

@@ -39,17 +39,14 @@
    \param mapset mapset that map belongs to
    \param[out] cellhd structure to hold cell header info
 
-   \return 0 on success
-   \return -1 on error
+   \return void
  */
-int Rast_get_cellhd(const char *name, const char *mapset,
-		    struct Cell_head *cellhd)
+void Rast_get_cellhd(const char *name, const char *mapset,
+		     struct Cell_head *cellhd)
 {
-    FILE *fd;
+    FILE *fp;
     int is_reclass;
     char real_name[GNAME_MAX], real_mapset[GMAPSET_MAX];
-    char buf[1024];
-    char *tail;
 
     /*
        is_reclass = Rast_is_reclass (name, mapset, real_name, real_mapset);
@@ -64,34 +61,22 @@ int Rast_get_cellhd(const char *name, const char *mapset,
      */
     is_reclass = (Rast_is_reclass(name, mapset, real_name, real_mapset) > 0);
     if (is_reclass) {
-	fd = G_fopen_old("cellhd", real_name, real_mapset);
-	if (fd == NULL) {
-	    sprintf(buf,
-		    _("Unable to read header file for raster map <%s@%s>."),
-		    name, mapset);
-	    tail = buf + strlen(buf);
-	    sprintf(tail, _(" It is a reclass of raster map <%s@%s> "),
-		    real_name, real_mapset);
-	    tail = buf + strlen(buf);
-	    if (!G_find_raster(real_name, real_mapset))
-		sprintf(tail, _("which is missing."));
-	    else
-		sprintf(tail, _("whose header file can't be opened."));
-	    G_warning("%s", buf);
-	    return -1;
-	}
+	fp = G_fopen_old("cellhd", real_name, real_mapset);
+	if (!fp)
+	    G_fatal_error(_("Unable to read header file for raster map <%s@%s>."
+			    "It is a reclass of raster map <%s@%s> %s"),
+			  name, mapset, real_name, real_mapset,
+			  !G_find_raster(real_name, real_mapset)
+			  ? _("which is missing.")
+			  : _("whose header file can't be opened."));
     }
     else {
-	fd = G_fopen_old("cellhd", name, mapset);
-	if (fd == NULL) {
-	    G_warning(_("Unable to open header file for raster map <%s@%s>"),
-		      name, mapset);
-	    return -1;
-	}
+	fp = G_fopen_old("cellhd", name, mapset);
+	if (!fp)
+	    G_fatal_error(_("Unable to open header file for raster map <%s@%s>"),
+			  name, mapset);
     }
 
-    G__read_Cell_head(fd, cellhd, 1);
-    fclose(fd);
-
-    return 0;
+    G__read_Cell_head(fp, cellhd, 1);
+    fclose(fp);
 }

lib/raster/opencell.c

@@ -193,9 +193,7 @@ int Rast__open_old(const char *name, const char *mapset)
     }
 
     /* read the cell header */
-    if (Rast_get_cellhd(r_name, r_mapset, &cellhd) < 0)
-	G_fatal_error(_("Error reading cellhd file for <%s>"),
-		      G_fully_qualified_name(name, mapset));
+    Rast_get_cellhd(r_name, r_mapset, &cellhd);
 
     /* now check the type */
     MAP_TYPE = Rast_map_type(r_name, r_mapset);

raster/r.bitpattern/main.c

@@ -101,8 +101,7 @@ int main(int argc, char *argv[])
     /* determine the inputmap type (CELL/FCELL/DCELL) */
     data_type = Rast_get_map_type(infd);
 
-    if (Rast_get_cellhd(name, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+    Rast_get_cellhd(name, "", &cellhd);
 
     /* Allocate input buffer */
     inrast = Rast_allocate_buf(data_type);

raster/r.category/cats.c

@@ -32,9 +32,7 @@ int get_cats(const char *name, const char *mapset)
     struct Cell_head cellhd;
 
     /* set the window to the cell header */
-    if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	G_fatal_error(_("Cannot read header of raster map <%s> in <%s>"),
-		      name, mapset);
+    Rast_get_cellhd(name, mapset, &cellhd);
 
     Rast_set_window(&cellhd);
 

raster/r.compress/main.c

@@ -171,11 +171,7 @@ static int doit(char *name, int uncompress, RASTER_MAP_TYPE map_type)
     int new, old, nrows, row;
     void *rast;
 
-    if (Rast_get_cellhd(name, G_mapset(), &cellhd) < 0) {
-	G_warning("Problem reading cell header for [%s]", name);
-	return 1;
-    }
-
+    Rast_get_cellhd(name, G_mapset(), &cellhd);
 
     /* check if already compressed/decompressed */
     if (uncompress && cellhd.compressed == 0) {

raster/r.describe/describe.c

@@ -43,8 +43,7 @@ int describe(const char *name, int compact, char *no_data_str,
 	get_row = Rast_get_c_row;
     }
     else {
-	if (Rast_get_cellhd(name, "", &window) < 0)
-	    G_fatal_error(_("Unable to get cell header for <%s>"), name);
+	Rast_get_cellhd(name, "", &window);
 
 	Rast_set_window(&window);
 	get_row = Rast_get_c_row_nomask;

raster/r.flow/io.c

@@ -63,8 +63,8 @@ static int open_existing_cell_file(char *fname, struct Cell_head *chd)
     if (mapset == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), fname);
 
-    if (chd && (Rast_get_cellhd(fname, mapset, chd) < 0))
-	G_fatal_error(_("Unable to get header for %s"), fname);
+    if (chd)
+	Rast_get_cellhd(fname, mapset, chd);
 
     return Rast_open_old(fname, mapset);
 }

raster/r.info/main.c

@@ -54,7 +54,7 @@ int main(int argc, char **argv)
     struct History hist;
     struct TimeStamp ts;
     int time_ok = 0, first_time_ok = 0, second_time_ok = 0;
-    int head_ok, cats_ok, hist_ok;
+    int cats_ok, hist_ok;
     int is_reclass;
     RASTER_MAP_TYPE data_type;
     struct Reclass reclass;
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
     if ((mapset = G_find_raster2(name, "")) == NULL)
 	G_fatal_error(_("Raster map <%s> not found"), name);
 
-    head_ok = Rast_get_cellhd(name, "", &cellhd) >= 0;
+    Rast_get_cellhd(name, "", &cellhd);
     cats_ok = Rast_read_cats(name, "", &cats) >= 0;
     hist_ok = Rast_read_history(name, "", &hist) >= 0;
     is_reclass = Rast_get_reclass(name, "", &reclass);
@@ -193,7 +193,7 @@ int main(int argc, char **argv)
 			 units, vdatum);
 	}
 
-	if (head_ok) {
+	{
 	    compose_line(out, "  Rows:         %d", cellhd.rows);
 	    compose_line(out, "  Columns:      %d", cellhd.cols);
 #ifdef HAVE_LONG_LONG_INT

raster/r.li/r.li.cwed/cwed.c

@@ -162,11 +162,7 @@ int contrastWeightedEdgeDensity(int fd, char **par, area_des ad,
 	return RLI_ERRORE;
     }
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1) {
-	G_fatal_error("can't read raster header");
-	return RLI_ERRORE;
-    }
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     for (i = 0; i < totRow; i++) {
 	long num = 0;

raster/r.li/r.li.daemon/daemon.c

@@ -350,8 +350,7 @@ int parseSetup(char *path, list l, g_areas g, char *raster)
     rel_cl = atof(strtok(NULL, "\n"));
 
     /* find raster map */
-    if (Rast_get_cellhd(raster, "", &cellhd) == -1)
-	G_fatal_error(_("Cannot read raster header file"));
+    Rast_get_cellhd(raster, "", &cellhd);
 
     /* calculate absolute sampling frame definition */
     sf_x = (int)rint(cellhd.cols * rel_x);

raster/r.li/r.li.daemon/worker.c

@@ -61,10 +61,7 @@ void worker(char *raster, int f(int, char **, area_des, double *),
 
     /* open raster map */
     fd = Rast_open_old(raster, "");
-    if (Rast_get_cellhd(raster, "", &hd) == -1) {
-	G_message(_("CHILD[pid = %i] cannot open raster map"), pid);
-	exit(EXIT_FAILURE);
-    }
+    Rast_get_cellhd(raster, "", &hd);
 
     /* read data type to allocate cache */
     data_type = Rast_map_type(raster, "");
@@ -235,12 +232,10 @@ char *mask_preprocessing(char *mask, char *raster, int rl, int cl)
 	    raster, mask, rl, cl);
 
     /* open raster */
-    if (Rast_get_cellhd(raster, "", &cell) == -1)
-	return NULL;
+    Rast_get_cellhd(raster, "", &cell);
 
     /* open raster */
-    if (Rast_get_cellhd(mask, "", &oldcell) == -1)
-	return NULL;
+    Rast_get_cellhd(mask, "", &oldcell);
 
     add_row = 1.0 * oldcell.rows / rl;
     add_col = 1.0 * oldcell.cols / cl;

raster/r.li/r.li.dominance/dominance.c

@@ -74,9 +74,7 @@ int dominance(int fd, char **par, area_des ad, double *result)
     struct Cell_head hd;
 
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.edgedensity/edgedensity.c

@@ -84,9 +84,7 @@ int edgedensity(int fd, char **valore, area_des ad, double *result)
     int ris = -1;
     double indice = 0;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.mpa/mpa.c

@@ -71,9 +71,7 @@ int meanPixelAttribute(int fd, char **par, area_des ad, double *result)
     double indice = 0;
     struct Cell_head hd;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.mps/mps.c

@@ -72,8 +72,7 @@ int meanPatchSize(int fd, char **par, area_des ad, double *result)
     double indice = 0;
     struct Cell_head hd;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.padcv/padcv.c

@@ -60,8 +60,8 @@ int patchAreaDistributionCV(int fd, char **par, area_des ad, double *result)
     struct Cell_head hd;
     int ris = RLI_OK;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
+
     switch (ad->data_type)
     {
     case CELL_TYPE:

raster/r.li/r.li.padrange/padrange.c

@@ -63,8 +63,8 @@ int patchAreaDistributionRANGE(int fd, char **par, area_des ad,
     struct Cell_head hd;
     int ris = RLI_OK;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
+
     switch (ad->data_type)
     {
     case CELL_TYPE:

raster/r.li/r.li.padsd/padsd.c

@@ -60,8 +60,8 @@ int patchAreaDistributionSD(int fd, char **par, area_des ad, double *result)
     struct Cell_head hd;
     int ris = RLI_OK;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
+
     switch (ad->data_type)
     {
     case CELL_TYPE:

raster/r.li/r.li.patchdensity/main.c

@@ -70,8 +70,8 @@ int patch_density(int fd, char **par, area_des ad, double *result)
     int mask_fd = -1, *mask_buf, *mask_sup, null_count = 0;
 
     Rast_set_c_null_value(&complete_value, 1);
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return 0;
+    Rast_get_cellhd(ad->raster, "", &hd);
+
     sup = Rast_allocate_c_buf();
 
     /* open mask if needed */

raster/r.li/r.li.patchnum/main.c

@@ -67,8 +67,8 @@ int patch_number(int fd, char **par, area_des ad, double *result)
     int mask_fd = -1, *mask_buf, *mask_sup, null_count = 0;
 
     Rast_set_c_null_value(&complete_value, 1);
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return 0;
+    Rast_get_cellhd(ad->raster, "", &hd);
+
     sup = Rast_allocate_c_buf();
 
     /* open mask if needed */

raster/r.li/r.li.richness/richness.c

@@ -69,8 +69,7 @@ int dominance(int fd, char **par, area_des ad, double *result)
     double indice = 0;
     struct Cell_head hd;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.shannon/shannon.c

@@ -70,9 +70,7 @@ int shannon(int fd, char **par, area_des ad, double *result)
     double indice = 0;
     struct Cell_head hd;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.li/r.li.shape/main.c

@@ -72,9 +72,7 @@ int shape_index(int fd, char **par, area_des ad, double *result)
     int *mask_buf;
 
     Rast_set_c_null_value(&complete_value, 1);
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return 0;
-
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     /* open mask if needed */
     if (ad->mask == 1) {

raster/r.li/r.li.simpson/simpson.c

@@ -69,8 +69,7 @@ int simpson(int fd, char **par, area_des ad, double *result)
     double indice = 0;
     struct Cell_head hd;
 
-    if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
-	return RLI_ERRORE;
+    Rast_get_cellhd(ad->raster, "", &hd);
 
     switch (ad->data_type) {
     case CELL_TYPE:

raster/r.los/main.c

@@ -180,13 +180,11 @@ int main(int argc, char *argv[])
     }
 
     /*  read header info for elevation layer        */
-    if (Rast_get_cellhd(elev_layer, old_mapset, &cellhd_elev) < 0)
-	G_fatal_error(_("[%s]: Cannot read map header"), elev_layer);
+    Rast_get_cellhd(elev_layer, old_mapset, &cellhd_elev);
 
     /*  if pattern layer present, read in its header info   */
     if (patt_flag == TRUE) {
-	if (Rast_get_cellhd(patt_layer, patt_mapset, &cellhd_patt) < 0)
-	    G_fatal_error(_("[%s]: Cannot read map header"), patt_layer);
+	Rast_get_cellhd(patt_layer, patt_mapset, &cellhd_patt);
 
 	/*  allocate buffer space for row-io to layer           */
 	cell = Rast_allocate_buf(CELL_TYPE);

raster/r.mapcalc/map.c

@@ -431,9 +431,7 @@ static void close_map(struct map *m)
     if (m->fd < 0)
 	return;
 
-    if (Rast_close(m->fd) < 0)
-	G_fatal_error(_("Unable to close raster map <%s@%s>"),
-		      m->name, m->mapset);
+    Rast_close(m->fd);
 
 #ifdef HAVE_PTHREAD_H
     pthread_mutex_destroy(&m->mutex);
@@ -664,8 +662,7 @@ void put_map_row(int fd, void *buf, int res_type)
 
 void close_output_map(int fd)
 {
-    if (Rast_close(fd) < 0)
-	G_fatal_error(_("Unable to close raster map"));
+    Rast_close(fd);
 }
 
 void unopen_output_map(int fd)

raster/r.neighbors/main.c

@@ -204,8 +204,7 @@ int main(int argc, char *argv[])
     ncb.newcell = parm.output->answer;
 
     if (!flag.align->answer) {
-	if (Rast_get_cellhd(ncb.oldcell, "", &cellhd) < 0)
-	    exit(EXIT_FAILURE);
+	Rast_get_cellhd(ncb.oldcell, "", &cellhd);
 	G_get_window(&window);
 	G_align_window(&window, &cellhd);
 	Rast_set_window(&window);

raster/r.null/main.c

@@ -155,9 +155,7 @@ int main(int argc, char *argv[])
 
     parse_vallist(parms.setnull->answers, &d_mask);
 
-    if (Rast_get_cellhd(name, mapset, &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"),
-		      G_fully_qualified_name(name, mapset));
+    Rast_get_cellhd(name, mapset, &cellhd);
 
     if (create) {
 	/* write a file of no-nulls */

raster/r.out.tiff/main.c

@@ -140,9 +140,7 @@ int main(int argc, char *argv[])
     palette = pflag->answer;
     tfw = tflag->answer;
 
-    if ((Rast_get_cellhd(inopt->answer, "", &cellhd) < 0))
-	G_fatal_error(_("Unable to read header of raster map <%s>"),
-		      inopt->answer);
+    Rast_get_cellhd(inopt->answer, "", &cellhd);
 
     G_get_window(&cellhd);
 

raster/r.recode/recode.c

@@ -29,10 +29,9 @@ int do_recode(void)
     /* set the window from the header for the input file */
     if (align_wind) {
 	G_get_window(&window);
-	if (Rast_get_cellhd(name, "", &cellhd) >= 0) {
-	    G_align_window(&window, &cellhd);
-	    Rast_set_window(&window);
-	}
+	Rast_get_cellhd(name, "", &cellhd);
+	G_align_window(&window, &cellhd);
+	Rast_set_window(&window);
     }
 
     G_get_set_window(&window);

raster/r.region/main.c

@@ -153,8 +153,7 @@ int main(int argc, char *argv[])
 
     name = parm.map->answer;
 
-    if (Rast_get_cellhd(name, G_mapset(), &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+    Rast_get_cellhd(name, G_mapset(), &cellhd);
 
     G_copy(&window, &cellhd, sizeof(window));
 
@@ -197,8 +196,7 @@ int main(int argc, char *argv[])
     }
 
     if ((name = parm.raster->answer)) {	/* raster= */
-	if (Rast_get_cellhd(name, "", &window) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+	Rast_get_cellhd(name, "", &window);
     }
 
     if ((name = parm.vect->answer)) {	/* vect= */
@@ -311,8 +309,8 @@ int main(int argc, char *argv[])
     if ((name = parm.align->answer)) {	/* align= */
 	struct Cell_head temp_window;
 
-	if (Rast_get_cellhd(name, "", &temp_window) < 0)
-	    G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+	Rast_get_cellhd(name, "", &temp_window);
+
 	if ((err = G_align_window(&window, &temp_window)))
 	    G_fatal_error("%s: %s", name, err);
     }

raster/r.resamp.rst/main.c

@@ -368,8 +368,7 @@ int main(int argc, char *argv[])
 
 	fdsmooth = Rast_open_old(smooth, "");
 
-	if (Rast_get_cellhd(smooth, "", &smhd) < 0)
-	    G_fatal_error(_("Unable to read header for <%s>"), smooth);
+	Rast_get_cellhd(smooth, "", &smhd);
 
 	if ((winhd.ew_res != smhd.ew_res) || (winhd.ns_res != smhd.ns_res))
 	    G_fatal_error(_("Map <%s> is the wrong resolution"), smooth);
@@ -383,8 +382,7 @@ int main(int argc, char *argv[])
 	    G_fatal_error(_("Smoothing values can not be negative or NULL"));
     }
 
-    if (Rast_get_cellhd(input, "", &inphd) < 0)
-	G_fatal_error(_("Unable to read header for <%s>"), input);
+    Rast_get_cellhd(input, "", &inphd);
 
     if ((winhd.ew_res != inphd.ew_res) || (winhd.ns_res != inphd.ns_res))
 	G_fatal_error(_("Input map resolution differs from current region resolution!"));

raster/r.resample/main.c

@@ -95,8 +95,7 @@ int main(int argc, char *argv[])
     data_type = Rast_get_map_type(infd);
     out_type = data_type;
 
-    if (Rast_get_cellhd(name, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header for <%s>"), name);
+    Rast_get_cellhd(name, "", &cellhd);
 
     /* raster buffer is big enough to hold data */
     rast = Rast_allocate_buf(data_type);

raster/r.slope.aspect/main.c

@@ -367,10 +367,9 @@ int main(int argc, char *argv[])
     /* set the window from the header for the elevation file */
     if (!flag.a->answer) {
 	G_get_window(&window);
-	if (Rast_get_cellhd(elev_name, "", &cellhd) >= 0) {
-	    G_align_window(&window, &cellhd);
-	    Rast_set_window(&window);
-	}
+	Rast_get_cellhd(elev_name, "", &cellhd);
+	G_align_window(&window, &cellhd);
+	Rast_set_window(&window);
     }
 
     if (strcmp(parm.out_precision->answer, "double") == 0)

raster/r.support.stats/histo.c

@@ -34,8 +34,7 @@ int do_histogram(const char *name)
     int row;
     int fd;
 
-    if (Rast_get_cellhd(name, "", &cellhd) < 0)
-	return 1;
+    Rast_get_cellhd(name, "", &cellhd);
 
     Rast_set_window(&cellhd);
     fd = Rast_open_old(name, "");

raster/r.support/histo.c

@@ -18,8 +18,7 @@ int do_histogram(const char *name)
     int row;
     int fd;
 
-    if (Rast_get_cellhd(name, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header for <%s>"), name);
+    Rast_get_cellhd(name, "", &cellhd);
 
     Rast_set_window(&cellhd);
     fd = Rast_open_old(name, "");

raster/r.support/main.c

@@ -43,7 +43,6 @@ int main(int argc, char *argv[])
     struct Option *map_opt, *units_opt, *vdatum_opt;
     struct Option *load_opt, *save_opt;
     struct Flag *stats_flag, *null_flag, *del_flag;
-    int cellhd_ok;		/* Is cell header OK? */
     int is_reclass;		/* Is raster reclass? */
     const char *infile;
     char title[MAX_TITLE_LEN + 1], datasrc[RECORD_LEN + 1];
@@ -148,7 +147,7 @@ int main(int argc, char *argv[])
     if (!mapset || strcmp(mapset, G_mapset()) != 0)
 	G_fatal_error(_("Raster map <%s> not found in current mapset"), infile);
 
-    cellhd_ok = (Rast_get_cellhd(raster->answer, "", &cellhd) >= 0);
+    Rast_get_cellhd(raster->answer, "", &cellhd);
     is_reclass = (Rast_is_reclass(raster->answer, "", rname, rmapset) > 0);
 
     if (title_opt->answer) {

raster/r.texture/main.c

@@ -216,8 +216,7 @@ int main(int argc, char *argv[])
     /* determine the inputmap type (CELL/FCELL/DCELL) */
     data_type = Rast_get_map_type(infd);
 
-    if (Rast_get_cellhd(name, "", &cellhd) < 0)
-	G_fatal_error(_("Unable to read header of raster map <%s>"), name);
+    Rast_get_cellhd(name, "", &cellhd);
 
     out_data_type = FCELL_TYPE;
     /* Allocate output buffer, use FCELL data_type */

raster/r.to.rast3/main.c

@@ -352,6 +352,5 @@ int open_input_raster_map(const char *name)
 /* ************************************************************************* */
 void close_input_raster_map(int fd)
 {
-    if (Rast_close(fd) < 0)
-	G_fatal_error(_("Unable to close input map"));
+    Rast_close(fd);
 }

raster/r.to.rast3elev/main.c

@@ -118,8 +118,7 @@ int open_input_raster_map(const char *name)
 /* ************************************************************************* */
 void close_input_raster_map(int fd)
 {
-    if (Rast_close(fd) < 0)
-	G_fatal_error(_("Unable to close input map"));
+    Rast_close(fd);
 }
 
 /* ************************************************************************* */

raster/r.topidx/file_io.c

@@ -15,8 +15,7 @@ void getcells(void)
     fd = Rast_open_old(iname, "");
 
     data_type = Rast_get_map_type(fd);
-    if (Rast_get_cellhd(iname, "", &inhead) < 0 )
-	G_fatal_error(_("Unable to read header of raster map <%s>"), iname);
+    Rast_get_cellhd(iname, "", &inhead);
 
     if (data_type == CELL_TYPE)
 	ccell = (CELL *) G_malloc(sizeof(CELL) * window.cols);

raster/r.water.outlet/main.c

@@ -159,8 +159,7 @@ int main(int argc, char *argv[])
     }
     G_free(bas);
     G_free(cell_buf);
-    if (Rast_close(basin_fd) < 0)
-	G_fatal_error(_("Unable to close new basin map layer"));
+    Rast_close(basin_fd);
 
     return 0;
 }

raster/r.watershed/ram/close_maps.c

@@ -60,8 +60,7 @@ int close_maps(void)
 		    Rast_put_row(fd, dbuf, DCELL_TYPE);
 		}
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 
 	    stddev =
 		sqrt((sum_sqr - (sum + sum / do_points)) / (do_points - 1));
@@ -144,8 +143,7 @@ int close_maps(void)
 		}
 		Rast_put_row(fd, buf, CELL_TYPE);
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 	}
 	Rast_init_colors(&colors);
 	Rast_make_aspect_colors(&colors, 0, 8);
@@ -174,8 +172,7 @@ int close_maps(void)
 		}
 		Rast_put_row(fd, buf, CELL_TYPE);
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 	}
 	Rast_init_colors(&colors);
 	Rast_make_rainbow_colors(&colors, 1, 120);
@@ -196,8 +193,7 @@ int close_maps(void)
 		}
 		Rast_put_row(fd, dbuf, DCELL_TYPE);
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 	}
 	G_free(l_s);
     }
@@ -213,8 +209,7 @@ int close_maps(void)
 		}
 		Rast_put_row(fd, dbuf, DCELL_TYPE);
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 	}
     }
 
@@ -230,8 +225,7 @@ int close_maps(void)
 		}
 		Rast_put_row(fd, dbuf, DCELL_TYPE);
 	    }
-	    if (Rast_close(fd) < 0)
-		G_warning(_("Close failed."));
+	    Rast_close(fd);
 	}
 	G_free(s_g);
     }

raster/r.watershed/seg/close_maps.c

@@ -51,8 +51,7 @@ int close_maps(void)
 	}
 	G_percent(r, nrows, 1);    /* finish it */
 
-	if (Rast_close(fd) < 0)
-	    G_warning(_("Close failed."));
+	Rast_close(fd);
 
 	stddev = sqrt((sum_sqr - (sum + sum / do_points)) / (do_points - 1));
 	G_debug(1, "stddev: %f", stddev);

raster3d/r3.cross.rast/main.c

@@ -74,8 +74,7 @@ void fatal_error(void *map, int elevfd, int outfd, char *errorMsg)
 /* ************************************************************************* */
 void close_output_map(int fd)
 {
-    if (Rast_close(fd) < 0)
-	G_fatal_error(_("Unable to close output map"));
+    Rast_close(fd);
 }
 
 
@@ -370,10 +369,8 @@ int main(int argc, char *argv[])
 		    G3d_maskOff(map);
 	}
 
-	if (Rast_close(outfd) < 0)
-	    fatal_error(map, elevfd, -1, _("Unable to close output map"));
-	if (Rast_close(elevfd) < 0)
-	    fatal_error(map, -1, -1, _("Unable to close elevation map"));
+	Rast_close(outfd);
+	Rast_close(elevfd);
 
     }
     else {

raster3d/r3.out.vtk/errorHandling.c

@@ -49,10 +49,7 @@ void fatal_error(char *errorMsg, input_maps * in)
 int CloseInputRasterMap(int fd)
 {
     if (fd != -1)
-	if (Rast_close(fd) < 0) {
-	    G_warning(_("unable to close input raster map"));
-	    return 1;
-	}
+	Rast_close(fd);
 
     return 0;
 

raster3d/r3.out.vtk/main.c

@@ -481,14 +481,12 @@ int main(int argc, char *argv[])
 	    write_vtk_unstructured_grid_cells(fp, region);
 	}
 
-	if (Rast_close(in->top) < 0) {
-	    G_fatal_error(_("unable to close top raster map"));
-	}
+	Rast_close(in->top);
+
 	in->top = -1;
 
-	if (Rast_close(in->bottom) < 0) {
-	    G_fatal_error(_("unable to close bottom raster map"));
-	}
+	Rast_close(in->bottom);
+
 	in->bottom = -1;
     }
     else {

raster3d/r3.to.rast/main.c

@@ -185,8 +185,7 @@ int open_output_map(const char *name, int res_type)
 /* ************************************************************************* */
 void close_output_map(int fd)
 {
-    if (Rast_close(fd) < 0)
-	G_fatal_error(_("Unable to close output map"));
+    Rast_close(fd);
 }
 
 /* ************************************************************************* */