[GRASS-SVN] r61367 - in grass/branches/releasebranch_7_0: . raster/r.reclass

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jul 23 04:44:03 PDT 2014


Author: neteler
Date: 2014-07-23 04:44:03 -0700 (Wed, 23 Jul 2014)
New Revision: 61367

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.reclass/main.c
   grass/branches/releasebranch_7_0/raster/r.reclass/parse.c
Log:
r.reclass: Print messages to stderr (trunk, r61160)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:59505,59646,60219,60278,60610,60807,60835,60936-60937,61159,61275,61288,61290,61292,61294,61301
   + /grass/trunk:59505,59646,60219,60278,60610,60807,60835,60936-60937,61159-61160,61275,61288,61290,61292,61294,61301

Modified: grass/branches/releasebranch_7_0/raster/r.reclass/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/main.c	2014-07-23 11:40:44 UTC (rev 61366)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/main.c	2014-07-23 11:44:03 UTC (rev 61367)
@@ -99,16 +99,16 @@
     any = 0;
 
     if (tty) {
-	fprintf(stdout,
+	fprintf(stderr,
 		_("Enter rule(s), \"end\" when done, \"help\" if you need it\n"));
 	if (map_type == FCELL_TYPE)
-	    fprintf(stdout, _("FCELL: Data range is %.7g to %.7g\n"),
+	    fprintf(stderr, _("FCELL: Data range is %.7g to %.7g\n"),
 		    (double)min, (double)max);
 	else if (map_type == DCELL_TYPE)
-	    fprintf(stdout, _("DCELL: Data range is %.15g to %.15g\n"),
+	    fprintf(stderr, _("DCELL: Data range is %.15g to %.15g\n"),
 		    (double)min, (double)max);
 	else
-	    fprintf(stdout, _("CELL: Data range is %ld to %ld\n"), (long)min,
+	    fprintf(stderr, _("CELL: Data range is %ld to %ld\n"), (long)min,
 		    (long)max);
     }
 

Modified: grass/branches/releasebranch_7_0/raster/r.reclass/parse.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/parse.c	2014-07-23 11:40:44 UTC (rev 61366)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/parse.c	2014-07-23 11:44:03 UTC (rev 61367)
@@ -38,11 +38,11 @@
 	case 0:
 	    save = cur;
 	    if (!strncmp(cur, "help", 4)) {	/* help text */
-		fprintf(stdout, _("Enter a rule in one of these formats:\n"));
-		fprintf(stdout, "1 3 5      = 1   %s\n", _("poor quality"));
-		fprintf(stdout, "1 thru 10  = 1\n");
-		fprintf(stdout, "20 thru 50 = 2   %s\n", _("medium quality"));
-		fprintf(stdout, "*          = NULL\n");
+		fprintf(stderr, _("Enter a rule in one of these formats:\n"));
+		fprintf(stderr, "1 3 5      = 1   %s\n", _("poor quality"));
+		fprintf(stderr, "1 thru 10  = 1\n");
+		fprintf(stderr, "20 thru 50 = 2   %s\n", _("medium quality"));
+		fprintf(stderr, "*          = NULL\n");
 		state = 0;
 		cur += 4;
 		continue;
@@ -193,7 +193,7 @@
 	*v = sign * (CELL) fv;
 
 	if (dec && state)
-	    fprintf(stdout, _("%f rounded up to %d\n"), sign * fv, *v);
+	    fprintf(stderr, _("%f rounded up to %d\n"), sign * fv, *v);
     }
 
     switch (*cur) {



More information about the grass-commit mailing list