More error handling:

 Rast_write[_vector]_cats
 Rast_write_colors
 Rast_write_histogram[_cs]
 Rast_write_history
 Rast_put_cellhd


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

display/d.colors/interact.c

@@ -318,13 +318,7 @@ static int save_colors(char *name, char *mapset, struct Colors *colors)
     Clear_message();
     Write_message(2, "Writing color table      ");
 
-    if (Rast_write_colors(name, mapset, colors) == -1) {
-	G_sleep(1);
-	Write_message(2, "Can't write color table  ");
-	G_sleep(2);
-	return 0;
-    }
-    else
-	Clear_message();
+    Rast_write_colors(name, mapset, colors);
+    Clear_message();
     return 1;
 }

imagery/i.pca/local_proto.h

@@ -2,6 +2,6 @@
 #define __LOCAL_PROTO_H__
 
 /* support.c */
-int write_support(int, char *, double **, double *);
+void write_support(int, char *, double **, double *);
 
 #endif

imagery/i.pca/support.c

@@ -2,13 +2,13 @@
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/glocale.h>
-
+#include "local_proto.h"
 
 /* function prototypes */
-static int write_history(int, char *, double **, double *);
+static void write_history(int, char *, double **, double *);
 
 
-int write_support(int bands, char *outname, double **eigmat, double *eigval)
+void write_support(int bands, char *outname, double **eigmat, double *eigval)
 {
     const char *mapset = G_mapset();
     struct Colors colors;
@@ -24,14 +24,13 @@ int write_support(int bands, char *outname, double **eigmat, double *eigval)
     if (Rast_map_is_fp(outname, mapset))
 	Rast_mark_colors_as_fp(&colors);
 
-    if (Rast_write_colors(outname, mapset, &colors) < 0)
-	G_message(_("Unable to write color table for raster map <%s>"), outname);
+    Rast_write_colors(outname, mapset, &colors);
 
-    return write_history(bands, outname, eigmat, eigval);
+    write_history(bands, outname, eigmat, eigval);
 }
 
 
-static int write_history(int bands, char *outname, double **eigmat, double *eigval)
+static void write_history(int bands, char *outname, double **eigmat, double *eigval)
 {
     int i, j;
     static int first_map = TRUE;     /* write to stderr? */
@@ -77,5 +76,5 @@ static int write_history(int bands, char *outname, double **eigmat, double *eigv
     /* only write to stderr the first time (this fn runs for every output map) */
     first_map = FALSE;
 
-    return Rast_write_history(outname, &hist);
+    Rast_write_history(outname, &hist);
 }

include/rasterdefs.h

@@ -48,8 +48,8 @@ int Rast_set_f_cat(const FCELL *, const FCELL *, const char *, struct Categories
 int Rast_set_d_cat(const DCELL *, const DCELL *, const char *, struct Categories *);
 int Rast_set_cat(const void *, const void *, const char *, struct Categories *,
 		 RASTER_MAP_TYPE);
-int Rast_write_cats(const char *, struct Categories *);
-int Rast_write_vector_cats(const char *, struct Categories *);
+void Rast_write_cats(const char *, struct Categories *);
+void Rast_write_vector_cats(const char *, struct Categories *);
 char *Rast_get_ith_d_cat(const struct Categories *, int, DCELL *,
 			 DCELL *);
 char *Rast_get_ith_f_cat(const struct Categories *, int, void *, void *);
@@ -232,7 +232,7 @@ void Rast_shift_c_colors(CELL, struct Colors *);
 void Rast_shift_d_colors(DCELL, struct Colors *);
 
 /* color_write.c */
-int Rast_write_colors(const char *, const char *, struct Colors *);
+void Rast_write_colors(const char *, const char *, struct Colors *);
 void Rast__write_colors(FILE *, struct Colors *);
 
 /* color_xform.c */
@@ -318,8 +318,8 @@ void Rast_histogram_eq(const struct Histogram *, unsigned char **,
 /* histogram.c */
 void Rast_init_histogram(struct Histogram *);
 int Rast_read_histogram(const char *, const char *, struct Histogram *);
-int Rast_write_histogram(const char *, const struct Histogram *);
-int Rast_write_histogram_cs(const char *, struct Cell_stats *);
+void Rast_write_histogram(const char *, const struct Histogram *);
+void Rast_write_histogram_cs(const char *, struct Cell_stats *);
 void Rast_make_histogram_cs(struct Cell_stats *, struct Histogram *);
 int Rast_get_histogram_num(const struct Histogram *);
 CELL Rast_get_histogram_cat(int, const struct Histogram *);
@@ -335,7 +335,7 @@ void Rast_zero_histogram(struct Histogram *);
 
 /* history.c */
 int Rast_read_history(const char *, const char *, struct History *);
-int Rast_write_history(const char *, struct History *);
+void Rast_write_history(const char *, struct History *);
 void Rast_short_history(const char *, const char *, struct History *);
 int Rast_command_history(struct History *);
 
@@ -400,7 +400,7 @@ int Rast_open_new_uncompressed(const char *, RASTER_MAP_TYPE);
 void Rast_set_quant_rules(int, struct Quant *);
 
 /* put_cellhd.c */
-int Rast_put_cellhd(const char *, struct Cell_head *);
+void Rast_put_cellhd(const char *, struct Cell_head *);
 
 /* put_row.c */
 void Rast_put_row(int, const void *, RASTER_MAP_TYPE);

lib/raster/cats.c

@@ -79,8 +79,8 @@ static void get_cond(char **, char *, DCELL);
 static int get_fmt(char **, char *, int *);
 static int cmp(const void *, const void *);
 
-static int write_cats(const char *element, const char *name,
-		      struct Categories *cats);
+static void write_cats(const char *element, const char *name,
+		       struct Categories *cats);
 static CELL read_cats(const char *element, const char *name,
 		      const char *mapset, struct Categories *pcats, int full);
 
@@ -925,12 +925,11 @@ int Rast_set_cat(const void *rast1, const void *rast2,
  * \param name map name
  * \param cats pointer to Categories structure
  *
- * \return 1 on success
- * \return -1 is returned (no diagnostic is printed)
+ * \return void
  */
-int Rast_write_cats(const char *name, struct Categories *cats)
+void Rast_write_cats(const char *name, struct Categories *cats)
 {
-    return write_cats("cats", name, cats);
+    write_cats("cats", name, cats);
 }
 
 /*!
@@ -943,16 +942,15 @@ int Rast_write_cats(const char *name, struct Categories *cats)
  * \param name map name
  * \param cats pointer to Categories structure
  *
- * \return 1 on success
- * \return -1 is returned (no diagnostic is printed)
+ * \return void
  */
-int Rast_write_vector_cats(const char *name, struct Categories *cats)
+void Rast_write_vector_cats(const char *name, struct Categories *cats)
 {
-    return write_cats("dig_cats", name, cats);
+    write_cats("dig_cats", name, cats);
 }
 
-static int write_cats(const char *element, const char *name,
-		      struct Categories *cats)
+static void write_cats(const char *element, const char *name,
+		       struct Categories *cats)
 {
     FILE *fd;
     int i, fp_map;
@@ -960,8 +958,9 @@ static int write_cats(const char *element, const char *name,
     DCELL val1, val2;
     char str1[100], str2[100];
 
-    if (!(fd = G_fopen_new(element, name)))
-	return -1;
+    fd = G_fopen_new(element, name);
+    if (!fd)
+	G_fatal_error(_("Unable to open %s file for map <%s>"), element, name);
 
     /* write # cats - note # indicate 3.0 or later */
     fprintf(fd, "# %ld categories\n", (long)cats->num);
@@ -1003,7 +1002,6 @@ static int write_cats(const char *element, const char *name,
 	}
     }
     fclose(fd);
-    return (1);
 }
 
 /*!

lib/raster/color_write.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <grass/gis.h>
+#include <grass/glocale.h>
 #include <grass/raster.h>
 
 static void write_rules(FILE *, struct _Color_Rule_ *, DCELL, DCELL);
@@ -66,10 +67,9 @@ static void format_max(char *, double);
  * \param mapset mapset name
  * \param colors pointer to structure Colors which holds color info
  *
- * \return 1 on success
- * \return -1 on failure
+ * \return void
  */
-int Rast_write_colors(const char *name, const char *mapset,
+void Rast_write_colors(const char *name, const char *mapset,
 		      struct Colors *colors)
 {
     char element[512];
@@ -78,7 +78,8 @@ int Rast_write_colors(const char *name, const char *mapset,
 
     if (G_name_is_fully_qualified(name, xname, xmapset)) {
 	if (strcmp(xmapset, mapset) != 0)
-	    return -1;
+	    G_fatal_error(_("Qualified name <%s> doesn't match mapset <%s>"),
+			  name, mapset);
 	name = xname;
     }
     /*
@@ -92,11 +93,11 @@ int Rast_write_colors(const char *name, const char *mapset,
 	strcpy(element, "colr");
     }
     if (!(fd = G_fopen_new(element, name)))
-	return -1;
+	G_fatal_error(_("Unable to create <%s> file for map <%s>"),
+		      element, name);
 
     Rast__write_colors(fd, colors);
     fclose(fd);
-    return 1;
 }
 
 /*!

lib/raster/histogram.c

@@ -38,8 +38,7 @@ void Rast_init_histogram(struct Histogram *histogram)
  * \param mapset: mapset that map belongs to 
  * \param histogram: struct for histogram
  * \return 1  if successful,
- *               0  if no histogram file,
- *              -1  on fail
+ *         0  if no histogram file,
  */
 
 int Rast_read_histogram(const char *name, const char *mapset,
@@ -52,38 +51,26 @@ int Rast_read_histogram(const char *name, const char *mapset,
 
     Rast_init_histogram(histogram);
 
-    if (G_find_file2_misc("cell_misc", "histogram", name, mapset) == NULL) {
+    if (!G_find_file2_misc("cell_misc", "histogram", name, mapset)) {
 	G_warning(_("Histogram for [%s in %s] missing (run r.support)"), name,
 		  mapset);
-
 	return 0;
     }
 
     fd = G_fopen_old_misc("cell_misc", "histogram", name, mapset);
-    if (!fd) {
-	G_warning(_("Can't read histogram for [%s in %s]"), name, mapset);
-
-	return -1;
-    }
+    if (!fd)
+	G_fatal_error(_("Can't read histogram for [%s in %s]"), name, mapset);
 
     while (fgets(buf, sizeof buf, fd)) {
-	if (sscanf(buf, "%ld:%ld", &cat, &count) != 2) {
-	    Rast_free_histogram(histogram);
-	    fclose(fd);
-	    G_warning(_("Invalid histogram file for [%s in %s]"), name,
-		      mapset);
-
-	    return -1;
-	}
+	if (sscanf(buf, "%ld:%ld", &cat, &count) != 2)
+	    G_fatal_error(_("Invalid histogram file for [%s in %s]"),
+			  name, mapset);
 	Rast_extend_histogram((CELL) cat, count, histogram);
     }
     fclose(fd);
 
-    if (histogram->num == 0) {
-	G_warning(_("Invalid histogram file for [%s in %s]"), name, mapset);
-
-	return -1;
-    }
+    if (histogram->num == 0)
+	G_fatal_error(_("Invalid histogram file for [%s in %s]"), name, mapset);
 
     Rast_sort_histogram(histogram);
 
@@ -97,28 +84,24 @@ int Rast_read_histogram(const char *name, const char *mapset,
  *  Writes the histogram information associated with map layer "name"
  * \param name: name of map
  * \param histogram: struct for histogram
- * \return  1  if successful,
- *              -1  on fail
+ * \return  void
  */
 
-int Rast_write_histogram(const char *name, const struct Histogram *histogram)
+void Rast_write_histogram(const char *name, const struct Histogram *histogram)
 {
-    FILE *fd;
+    FILE *fp;
     int n;
     LIST *list;
 
-    fd = fopen_histogram_new(name);
-    if (fd == NULL)
-	return -1;
+    fp = fopen_histogram_new(name);
 
     list = histogram->list;
     for (n = 0; n < histogram->num; n++) {
 	if (list[n].count)
-	    fprintf(fd, "%ld:%ld\n", (long)list[n].cat, list[n].count);
+	    fprintf(fp, "%ld:%ld\n", (long)list[n].cat, list[n].count);
     }
-    fclose(fd);
 
-    return 1;
+    fclose(fp);
 }
 
 
@@ -127,28 +110,24 @@ int Rast_write_histogram(const char *name, const struct Histogram *histogram)
  *
  * \param name: name of map
  * \param statf: cell statistics
- * \return 1 on success
- *        -1 on failure
+ * \return void
  */
 
-int Rast_write_histogram_cs(const char *name, struct Cell_stats *statf)
+void Rast_write_histogram_cs(const char *name, struct Cell_stats *statf)
 {
-    FILE *fd;
+    FILE *fp;
     CELL cat;
     long count;
 
-    fd = fopen_histogram_new(name);
-    if (fd == NULL)
-	return -1;
+    fp = fopen_histogram_new(name);
 
     Rast_rewind_cell_stats(statf);
     while (Rast_next_cell_stat(&cat, &count, statf)) {
 	if (count > 0)
-	    fprintf(fd, "%ld:%ld\n", (long)cat, count);
+	    fprintf(fp, "%ld:%ld\n", (long)cat, count);
     }
-    fclose(fd);
 
-    return 1;
+    fclose(fp);
 }
 
 
@@ -345,17 +324,15 @@ static int cmp_count(const void *aa, const void *bb)
 
 static FILE *fopen_histogram_new(const char *name)
 {
-    FILE *fd;
+    FILE *fp;
 
-    fd = G_fopen_new_misc("cell_misc", "histogram", name);
-    if (fd == NULL)
-	G_warning(_("can't create histogram for [%s in %s]"), name,
-		  G_mapset());
+    fp = G_fopen_new_misc("cell_misc", "histogram", name);
+    if (!fp)
+	G_fatal_error(_("Unable to create histogram file for <%s>"), name);
 
-    return fd;
+    return fp;
 }
 
-
 /*!
  * \brief Removes the histogram
  *

lib/raster/history.c

@@ -107,18 +107,13 @@ int Rast_read_history(const char *name, const char *mapset,
     return 0;
 }
 
-void print_history_error(const char *name, const char *mapset, FILE * fd)
+static void print_history_error(const char *name, const char *mapset, FILE *fp)
 {
-    if (fd != NULL)
-	fclose(fd);
+    if (fp)
+	fclose(fp);
 
-    if (mapset) {
-	G_warning(_("Unable to get history information for <%s@%s>"),
-		  name, mapset);
-    }
-    else {			/* write */
-	G_warning(_("Unable to write history information for <%s>"), name);
-    }
+    G_warning(_("Unable to get history information for <%s@%s>"),
+	      name, mapset);
 }
 
 /*!
@@ -136,35 +131,30 @@ void print_history_error(const char *name, const char *mapset, FILE * fd)
  * \param name map name
  * \param[out] hist pointer to History structure which holds history info
  *
- * \return -1 on error
- * \return 0 on success
+ * \return void
  */
-int Rast_write_history(const char *name, struct History *hist)
+void Rast_write_history(const char *name, struct History *hist)
 {
-    FILE *fd;
+    FILE *fp;
     int i;
 
-    fd = G_fopen_new("hist", name);
-    if (!fd) {
-	print_history_error(name, NULL, fd);
-	return -1;
-    }
+    fp = G_fopen_new("hist", name);
+    if (!fp)
+	G_fatal_error(_("Unable to write history information for <%s>"), name);
 
-    fprintf(fd, "%s\n", hist->mapid);
-    fprintf(fd, "%s\n", hist->title);
-    fprintf(fd, "%s\n", hist->mapset);
-    fprintf(fd, "%s\n", hist->creator);
-    fprintf(fd, "%s\n", hist->maptype);
-    fprintf(fd, "%s\n", hist->datsrc_1);
-    fprintf(fd, "%s\n", hist->datsrc_2);
-    fprintf(fd, "%s\n", hist->keywrd);
+    fprintf(fp, "%s\n", hist->mapid);
+    fprintf(fp, "%s\n", hist->title);
+    fprintf(fp, "%s\n", hist->mapset);
+    fprintf(fp, "%s\n", hist->creator);
+    fprintf(fp, "%s\n", hist->maptype);
+    fprintf(fp, "%s\n", hist->datsrc_1);
+    fprintf(fp, "%s\n", hist->datsrc_2);
+    fprintf(fp, "%s\n", hist->keywrd);
 
     for (i = 0; i < hist->edlinecnt; i++)
-	fprintf(fd, "%s\n", hist->edhist[i]);
+	fprintf(fp, "%s\n", hist->edhist[i]);
 
-    fclose(fd);
-
-    return 0;
+    fclose(fp);
 }
 
 /*!

lib/raster/put_cellhd.c

@@ -23,20 +23,16 @@
    \param name name of map
    \param cellhd structure holding cell header info
 
-   \return 0 on success
-   \return -1 on failure
+   \return void
  */
-int Rast_put_cellhd(const char *name, struct Cell_head *cellhd)
+void Rast_put_cellhd(const char *name, struct Cell_head *cellhd)
 {
-    FILE *fd;
+    FILE *fp;
 
-    if (!(fd = G_fopen_new("cellhd", name))) {
-	G_warning(_("Unable to create header file for <%s>"), name);
-	return -1;
-    }
+    fp = G_fopen_new("cellhd", name);
+    if (!fp)
+	G_fatal_error(_("Unable to create header file for <%s>"), name);
 
-    G__write_Cell_head(fd, cellhd, 1);
-    fclose(fd);
-
-    return 0;
+    G__write_Cell_head(fp, cellhd, 1);
+    fclose(fp);
 }

lib/rst/interp_float/resout2d.c

@@ -240,11 +240,7 @@ int IL_resample_output_2d(struct interp_params *params, double zmin, double zmax
 		return -1;
 	    }
 
-	    if (Rast_write_colors(params->elev, maps, &colors2) < 0) {
-		G_warning(_("Unable to write color file of raster map <%s>"),
-			  params->elev);
-		return -1;
-	    }
+	    Rast_write_colors(params->elev, maps, &colors2);
 	    Rast_quantize_fp_map_range(params->elev, mapset,
 				    zminac - 0.5, zmaxac + 0.5,
 				    (CELL) (zminac - 0.5),

raster/r.carve/enforce.h

@@ -74,7 +74,7 @@ void *read_raster(void *, const int, const RASTER_MAP_TYPE);
 void *write_raster(void *, const int, const RASTER_MAP_TYPE);
 
 /* support.c */
-extern int update_rast_history(struct parms *);
+extern void update_rast_history(struct parms *);
 
 /* vect.c */
 extern int open_new_vect(struct Map_info *, char *);

raster/r.carve/support.c

@@ -28,10 +28,8 @@
 /*
  * update_rast_history - Update a history file.  Some of the digit file 
  * information is placed in the history file.
- * returns  0  -  successful creation of history file
- *         -1  -  error
  */
-int update_rast_history(struct parms *parm)
+void update_rast_history(struct parms *parm)
 {
     struct History hist;
 
@@ -43,6 +41,5 @@ int update_rast_history(struct parms *parm)
     sprintf(hist.datsrc_2, "vector stream file: %s", parm->invect->answer);
     hist.edlinecnt = 2;
     Rast_command_history(&hist);
-
-    return Rast_write_history(parm->outrast->answer, &hist);
+    Rast_write_history(parm->outrast->answer, &hist);
 }

raster/r.category/main.c

@@ -155,9 +155,9 @@ int main(int argc, char *argv[])
 		G_fatal_error(_("Unable to read category file of raster map <%s@%s>"),
 			      parm.raster->answer, cmapset);
 
-	    if (Rast_write_cats(name, &cats) >= 0)
-		G_message(_("Category table for <%s> set from <%s>"), name,
-			  parm.raster->answer);
+	    Rast_write_cats(name, &cats);
+	    G_message(_("Category table for <%s> set from <%s>"),
+		      name, parm.raster->answer);
 
 	    Rast_close(fd);
 	}
@@ -193,9 +193,7 @@ int main(int argc, char *argv[])
 		    Rast_set_d_cat(&d1, &d1, label, &cats);
 	    }
 
-	    if (Rast_write_cats(name, &cats) < 0)
-		G_fatal_error(_("Cannot create category file for <%s>"),
-			      name);
+	    Rast_write_cats(name, &cats);
 
 	    if (!from_stdin)
 		fclose(fp);
@@ -239,9 +237,7 @@ int main(int argc, char *argv[])
 
 	    Rast_set_cats_fmt(fmt_str, m1, a1, m2, a2, &cats);
 
-	    if (Rast_write_cats(name, &cats) != 1)
-		G_fatal_error(_("Cannot create category file for <%s>"),
-			      name);
+	    Rast_write_cats(name, &cats);
 	}
 
 	Rast_free_cats(&cats);

raster/r.colors/main.c

@@ -378,10 +378,10 @@ int main(int argc, char **argv)
     if (fp)
 	Rast_mark_colors_as_fp(&colors);
 
-    if (Rast_write_colors(name, mapset, &colors) >= 0)
-	G_message(_("Color table for raster map <%s> set to '%s'"), name,
-		  is_from_stdin ? "rules" : style ? style : rules ? rules :
-		  cmap);
+    Rast_write_colors(name, mapset, &colors);
+    G_message(_("Color table for raster map <%s> set to '%s'"), name,
+	      is_from_stdin ? "rules" : style ? style : rules ? rules :
+	      cmap);
 
     exit(EXIT_SUCCESS);
 }

raster/r.grow/main.c

@@ -275,12 +275,10 @@ int main(int argc, char **argv)
     Rast_close(in_fd);
     Rast_close(out_fd);
 
-    if (Rast_write_cats(out_name, &cats) == -1)
-	G_warning(_("Error writing category file for <%s>"), out_name);
+    Rast_write_cats(out_name, &cats);
 
     if (colrfile)
-	if (Rast_write_colors(out_name, G_mapset(), &colr) == -1)
-	    G_warning(_("Error writing color file for <%s>"), out_name);
+	Rast_write_colors(out_name, G_mapset(), &colr);
 
     Rast_short_history(out_name, "raster", &history);
     Rast_command_history(&history);

raster/r.lake/main.c

@@ -365,9 +365,7 @@ int main(int argc, char *argv[])
 				  &max_depth, 0, 50, 170, &colr);
     }
 
-    if (Rast_write_colors(lakemap, G_mapset(), &colr) != 1)
-	G_fatal_error(_("Unable to read color file of raster map <%s>"),
-		      lakemap);
+    Rast_write_colors(lakemap, G_mapset(), &colr);
 
     Rast_short_history(lakemap, "raster", &history);
     Rast_command_history(&history);

raster/r.param.scale/write_cats.c

@@ -51,9 +51,7 @@ void write_cats(void)
     /*                     WRITE OUT CATEGORIES STRUCTURE                     */
 
     /*------------------------------------------------------------------------*/
-    if (Rast_write_cats(rast_out_name, &cats) <= 0)
-	G_warning(_("Cannot write category file for raster map <%s>"),
-		  rast_out_name);
+    Rast_write_cats(rast_out_name, &cats);
 
     Rast_free_cats(&cats);
 

raster/r.random.surface/save.c

@@ -213,7 +213,5 @@ void SaveMap(int NumMap, int MapSeed)
     Rast_add_c_color_rule(&Low, LowColor, LowColor, LowColor,
 			  &High, HighColor, HighColor, HighColor, &Colr);
 
-    if (Rast_write_colors(OutNames[NumMap], G_mapset(), &Colr) == -1)
-	G_warning(_("Unable to write color table for raster map <%s>"),
-		  OutNames[NumMap]);
+    Rast_write_colors(OutNames[NumMap], G_mapset(), &Colr);
 }

raster/r.reclass/reclass.c

@@ -241,8 +241,7 @@ int reclass(const char *old_name, const char *old_mapset,
     fclose(fd);
 
     Rast_set_cats_title(title, cats);
-    if (Rast_write_cats(new_name, cats) == -1)
-	G_fatal_error(_("Cannot create category file of <%s>"), new_name);
+    Rast_write_cats(new_name, cats);
 
     Rast_free_cats(cats);
 

raster/r.region/main.c

@@ -326,8 +326,7 @@ int main(int argc, char *argv[])
     cellhd.east = window.east;
     cellhd.west = window.west;
 
-    if (Rast_put_cellhd(parm.map->answer, &cellhd) < 0)
-	G_fatal_error(_("Unable to update boundaries"));
+    Rast_put_cellhd(parm.map->answer, &cellhd);
 
     G_done_msg(" ");
 

raster/r.resamp.interp/main.c

@@ -312,9 +312,7 @@ int main(int argc, char *argv[])
     if (Rast_read_colors(rastin->answer, "", &colors) < 0)
 	G_fatal_error(_("Unable to read color table for %s"), rastin->answer);
     Rast_mark_colors_as_fp(&colors);
-    if (Rast_write_colors(rastout->answer, G_mapset(), &colors) < 0)
-	G_fatal_error(_("Unable to write color table for %s"),
-		      rastout->answer);
+    Rast_write_colors(rastout->answer, G_mapset(), &colors);
 
     return (EXIT_SUCCESS);
 }

raster/r.resamp.stats/main.c

@@ -381,9 +381,7 @@ int main(int argc, char *argv[])
 	    G_fatal_error(_("Unable to read color table for %s"),
 			  parm.rastin->answer);
 	Rast_mark_colors_as_fp(&colors);
-	if (Rast_write_colors(parm.rastout->answer, G_mapset(), &colors) < 0)
-	    G_fatal_error(_("Unable to write color table for %s"),
-			  parm.rastout->answer);
+	Rast_write_colors(parm.rastout->answer, G_mapset(), &colors);
     }
 
     return (EXIT_SUCCESS);

raster/r.support/main.c

@@ -287,9 +287,9 @@ int main(int argc, char *argv[])
 	    G_fatal_error(_("Unable to read category file of raster map <%s>"),
 			  map_opt->answer);
 
-	if (Rast_write_cats(infile, &cats) >= 0)
-	    G_message(_("cats table for [%s] set to %s"), infile,
-		      map_opt->answer);
+	Rast_write_cats(infile, &cats);
+	G_message(_("cats table for [%s] set to %s"),
+		  infile, map_opt->answer);
 	Rast_close(fd);
 	Rast_free_cats(&cats);
     }

raster/r.terraflow/main.cc

@@ -360,10 +360,8 @@ setFlowAccuColorTable(char* cellname) {
   Rast_add_c_color_rule(&v[3],   0,127,255,  &v[4],       0,0,255,   &colors);
   Rast_add_c_color_rule(&v[4],   0,0,255,    &v[5],   0,0,0,     &colors);
 
- 
-  if (Rast_write_colors(cellname, mapset, &colors) == -1) {
-    G_fatal_error(_("cannot write colors"));
-  }
+  Rast_write_colors(cellname, mapset, &colors);
+
   Rast_free_colors(&colors);
 }
 
@@ -386,9 +384,8 @@ setSinkWatershedColorTable(char* cellname) {
   Rast_init_colors(&colors);
   Rast_make_random_colors(&colors, 1, r.max);
 
-  if (Rast_write_colors(cellname, mapset, &colors) == -1) {
-    G_fatal_error(_("cannot write colors"));
-  }
+  Rast_write_colors(cellname, mapset, &colors);
+
   Rast_free_colors(&colors);
 }
 

raster/r.watershed/front/main.c

@@ -22,7 +22,7 @@
 #include <grass/glocale.h>
 #include <grass/spawn.h>
 
-int write_hist(char *, char *, char *, int, int);
+static void write_hist(char *, char *, char *, int, int);
 
 static const char *new_argv[22];
 static int new_argc;
@@ -343,7 +343,7 @@ int main(int argc, char *argv[])
 }
 
 /* record map history info */
-int write_hist(char *map_name, char *title, char *source_name, int mode, int sfd)
+static void write_hist(char *map_name, char *title, char *source_name, int mode, int sfd)
 {
     struct History history;
 
@@ -359,5 +359,5 @@ int write_hist(char *map_name, char *title, char *source_name, int mode, int sfd
     history.edlinecnt = 2;
     Rast_command_history(&history);
 
-    return Rast_write_history(map_name, &history);
+    Rast_write_history(map_name, &history);
 }

vector/v.to.rast/support.c

@@ -35,7 +35,9 @@ int update_hist(const char *raster_name, const char *vector_name, long scale)
     /* store command line options */
     Rast_command_history(&hist);
 
-    return (Rast_write_history(raster_name, &hist));
+    Rast_write_history(raster_name, &hist);
+
+    return 0;
 }
 
 
@@ -482,9 +484,7 @@ int update_labels(const char *rast_name, const char *vector_map, int field,
     }
 
     Rast_close(fd);
-    if (Rast_write_cats(rast_name, &rast_cats) <= 0)
-	G_warning(_("Unable to write categories for raster map <%s>"),
-		  rast_name);
+    Rast_write_cats(rast_name, &rast_cats);
     Rast_free_cats(&rast_cats);
 
     return 1;