[GRASS-SVN] r33063 - grass/branches/develbranch_6/lib/proj

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-25 10:49:39 -0400 (Mon, 25 Aug 2008)
New Revision: 33063

Modified:
   grass/branches/develbranch_6/lib/proj/datum.c
Log:
glynn: Use sprintf() instead of G_asprintf()
(merge from trunk, r33061)


Modified: grass/branches/develbranch_6/lib/proj/datum.c
===================================================================
--- grass/branches/develbranch_6/lib/proj/datum.c	2008-08-25 14:48:00 UTC (rev 33062)
+++ grass/branches/develbranch_6/lib/proj/datum.c	2008-08-25 14:49:39 UTC (rev 33063)
@@ -379,7 +379,7 @@
 								 *inputname)
 {
     FILE *fd;
-    char *file;
+    char file[GPATH_MAX];
     char buf[1024];
     int line;
     struct gpj_datum_transform_list *current = NULL, *outputlist = NULL;
@@ -412,7 +412,7 @@
 
     /* Now check for additional parameters in datumtransform.table */
 
-    G_asprintf(&file, "%s%s", G_gisbase(), DATUMTRANSFORMTABLE);
+    sprintf(file, "%s%s", G_gisbase(), DATUMTRANSFORMTABLE);
 
     fd = fopen(file, "r");
     if (!fd) {
@@ -471,13 +471,13 @@
 struct datum_list *read_datum_table(void)
 {
     FILE *fd;
-    char *file;
+    char file[GPATH_MAX];
     char buf[4096];
     int line;
     struct datum_list *current = NULL, *outputlist = NULL;
     int count = 0;
 
-    G_asprintf(&file, "%s%s", G_gisbase(), DATUMTABLE);
+    sprintf(file, "%s%s", G_gisbase(), DATUMTABLE);
 
     fd = fopen(file, "r");
     if (!fd) {