Browse Source

G_asprintf2() changed to G_rasprintf()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50385 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 years ago
parent
commit
d8346217e9
1 changed files with 12 additions and 12 deletions
  1. 12 12
      lib/vector/Vlib/ascii.c

+ 12 - 12
lib/vector/Vlib/ascii.c

@@ -454,9 +454,9 @@ int Vect_write_ascii(FILE *ascii,
 	    if (ver < 5) {
 		if (att != NULL) {
 		    if (cat > 0) {
-			G_asprintf2(&xstring, &xsize, "%.*f", dp, Points->x[0]);
+			G_rasprintf(&xstring, &xsize, "%.*f", dp, Points->x[0]);
 			G_trim_decimal(xstring);
-			G_asprintf2(&ystring, &ysize, "%.*f", dp, Points->y[0]);
+			G_rasprintf(&ystring, &ysize, "%.*f", dp, Points->y[0]);
 			G_trim_decimal(ystring);
 			fprintf(att, "A %s %s %d\n", xstring, ystring, cat);
 		    }
@@ -489,7 +489,7 @@ int Vect_write_ascii(FILE *ascii,
 		    (window.west > Points->x[0]))
 		    continue;
 	    }
-	    G_asprintf2(&xstring, &xsize, "%.*f", dp, Points->x[0]);
+	    G_rasprintf(&xstring, &xsize, "%.*f", dp, Points->x[0]);
 	    G_trim_decimal(xstring);
 
 	    if (region_flag) {
@@ -497,7 +497,7 @@ int Vect_write_ascii(FILE *ascii,
 		    (window.south > Points->y[0]))
 		    continue;
 	    }
-	    G_asprintf2(&ystring, &ysize, "%.*f", dp, Points->y[0]);
+	    G_rasprintf(&ystring, &ysize, "%.*f", dp, Points->y[0]);
 	    G_trim_decimal(ystring);
 
 	    Vect_field_cat_get(Cats, field, fcats);
@@ -532,7 +532,7 @@ int Vect_write_ascii(FILE *ascii,
 			(window.bottom > Points->z[0]))
 			continue;
 		}
-		G_asprintf2(&zstring, &zsize, "%.*f", dp, Points->z[0]);
+		G_rasprintf(&zstring, &zsize, "%.*f", dp, Points->z[0]);
 		G_trim_decimal(zstring);
 		fprintf(ascii, "%s%s%s%s%s", xstring, fs, ystring, fs,
 			zstring);
@@ -605,14 +605,14 @@ int Vect_write_ascii(FILE *ascii,
 
 	    while (Points->n_points--) {
 
-		G_asprintf2(&xstring, &xsize, "%.*f", dp, *xptr++);
+		G_rasprintf(&xstring, &xsize, "%.*f", dp, *xptr++);
 		G_trim_decimal(xstring);
-		G_asprintf2(&ystring, &ysize, "%.*f", dp, *yptr++);
+		G_rasprintf(&ystring, &ysize, "%.*f", dp, *yptr++);
 		G_trim_decimal(ystring);
 
 		if (ver == 5) {
 		    if (Map->head.with_z) {
-			G_asprintf2(&zstring, &zsize, "%.*f", dp, *zptr++);
+			G_rasprintf(&zstring, &zsize, "%.*f", dp, *zptr++);
 			G_trim_decimal(zstring);
 			fprintf(ascii, " %-12s %-12s %-12s\n", xstring,
 				ystring, zstring);
@@ -635,9 +635,9 @@ int Vect_write_ascii(FILE *ascii,
 	    else {
 		if (cat > 0) {
 		    if (ltype == GV_POINT) {
-			G_asprintf2(&xstring, &xsize, "%.*f", dp, Points->x[0]);
+			G_rasprintf(&xstring, &xsize, "%.*f", dp, Points->x[0]);
 			G_trim_decimal(xstring);
-			G_asprintf2(&ystring, &ysize, "%.*f", dp, Points->y[0]);
+			G_rasprintf(&ystring, &ysize, "%.*f", dp, Points->y[0]);
 			G_trim_decimal(ystring);
 			fprintf(att, "P %s %s %d\n", xstring, ystring, cat);
 		    }
@@ -645,9 +645,9 @@ int Vect_write_ascii(FILE *ascii,
 			x = (Points->x[1] + Points->x[0]) / 2;
 			y = (Points->y[1] + Points->y[0]) / 2;
 
-			G_asprintf2(&xstring, &xsize, "%.*f", dp, x);
+			G_rasprintf(&xstring, &xsize, "%.*f", dp, x);
 			G_trim_decimal(xstring);
-			G_asprintf2(&ystring, &ysize, "%.*f", dp, y);
+			G_rasprintf(&ystring, &ysize, "%.*f", dp, y);
 			G_trim_decimal(ystring);
 			fprintf(att, "L %s %s %d\n", xstring, ystring, cat);
 		    }