[GRASS-SVN] r50636 - grass/trunk/lib/raster

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Feb 2 09:28:15 EST 2012


Author: mmetz
Date: 2012-02-02 06:28:15 -0800 (Thu, 02 Feb 2012)
New Revision: 50636

Modified:
   grass/trunk/lib/raster/close.c
   grass/trunk/lib/raster/put_row.c
Log:
rasterlib: fix messages

Modified: grass/trunk/lib/raster/close.c
===================================================================
--- grass/trunk/lib/raster/close.c	2012-02-02 12:50:48 UTC (rev 50635)
+++ grass/trunk/lib/raster/close.c	2012-02-02 14:28:15 UTC (rev 50636)
@@ -371,7 +371,7 @@
 	if (fcb->null_cur_row > 0) {
 	    /* if temporary NULL file exists, write it into cell_misc/name/null */
 	    if (rename(fcb->null_temp_name, path)) {
-		G_warning(_("Unable to rename null file '%s'"),
+		G_warning(_("Unable to rename null file '%s' to '%s'"),
 			  fcb->null_temp_name, path);
 		stat = -1;
 	    }
@@ -437,7 +437,7 @@
 	G_file_name(path, CELL_DIR, fcb->name, fcb->mapset);
 	remove(path);
 	if (rename(fcb->temp_name, path)) {
-	    G_warning(_("Unable to rename cell file '%s'"),
+	    G_warning(_("Unable to rename cell file '%s' to '%s'"),
 		      fcb->temp_name, path);
 	    stat = -1;
 	}

Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c	2012-02-02 12:50:48 UTC (rev 50635)
+++ grass/trunk/lib/raster/put_row.c	2012-02-02 14:28:15 UTC (rev 50636)
@@ -118,7 +118,7 @@
 
     if (write(fcb->data_fd, buf, nwrite) != nwrite)
 	G_fatal_error(_("Error writing uncompressed FP data for row %d of <%s>"),
-		      fcb->name, row);
+		      row, fcb->name);
 }
 
 static void write_data_compressed(int fd, int row, unsigned char *buf, int n)
@@ -128,7 +128,7 @@
 
     if (G_zlib_write(fcb->data_fd, buf, nwrite) < 0)
 	G_fatal_error(_("Error writing compressed FP data for row %d of <%s>"),
-		      fcb->name, row);
+		      row, fcb->name);
 }
 
 static void set_file_pointer(int fd, int row)



More information about the grass-commit mailing list