[GRASS-SVN] r38729 - grass/branches/develbranch_6/raster/r.li/r.li.daemon

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-08-14 09:30:34 -0400 (Fri, 14 Aug 2009)
New Revision: 38729

Modified:
   grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
Log:
improved warning message

Modified: grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c	2009-08-14 13:02:03 UTC (rev 38728)
+++ grass/branches/develbranch_6/raster/r.li/r.li.daemon/worker.c	2009-08-14 13:30:34 UTC (rev 38729)
@@ -136,7 +136,7 @@
 	    ad->mask_name = mask_preprocessing(toReceive.f.f_ma.mask,
 					       raster, ad->rl, ad->cl);
 	    if (ad->mask_name == NULL) {
-		G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+		G_message(_("CHILD[pid = %i]: unable to open <%s> mask ... continuing without!"),
 			  pid, toReceive.f.f_ma.mask);
 		ad->mask = -1;
 	    }
@@ -146,14 +146,13 @@
 		    erease_mask = 1;
 		ad->mask = open(ad->mask_name, O_WRONLY, 0755);
 		if (ad->mask == -1) {
-		    G_message(_("CHILD[pid = %i]: unable to open %s mask ... continue without!!!"),
+		    G_message(_("CHILD[pid = %i]: unable to open <%s> mask ... continuing without!"),
 			      pid, toReceive.f.f_ma.mask);
 		}
 
 	    }
+	}
 
-
-	}
 	/* memory menagement */
 	if (ad->rl > used) {
 	    /* allocate cache */
@@ -229,10 +228,12 @@
     double add_row, add_col;
 
     buf = malloc(cl * sizeof(int));
+
     mapset = G_find_cell(raster, "");
     /* open raster */
     if (G_get_cellhd(raster, mapset, &cell) == -1)
 	return NULL;
+
     mapset = G_find_cell(mask, "");
     /* open raster */
     if (G_get_cellhd(mask, mapset, &oldcell) == -1)
@@ -240,10 +241,12 @@
 
     add_row = 1.0 * oldcell.rows / rl;
     add_col = 1.0 * oldcell.cols / cl;
+
     tmp_file = G_tempfile();
     mask_fd = open(tmp_file, O_RDWR | O_CREAT, 0755);
     old_fd = G_open_cell_old(mask, mapset);
     old = G_allocate_cell_buf();
+
     for (i = 0; i < rl; i++) {
 	int riga;