[GRASS-SVN] r40965 - grass/trunk/visualization/nviz/src

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-02-13 04:06:24 -0500 (Sat, 13 Feb 2010)
New Revision: 40965

Modified:
   grass/trunk/visualization/nviz/src/do_zoom.c
Log:
Rename asprintf() -> xsprintf() to avoid conflict


Modified: grass/trunk/visualization/nviz/src/do_zoom.c
===================================================================
--- grass/trunk/visualization/nviz/src/do_zoom.c	2010-02-13 06:06:15 UTC (rev 40964)
+++ grass/trunk/visualization/nviz/src/do_zoom.c	2010-02-13 09:06:24 UTC (rev 40965)
@@ -44,7 +44,7 @@
 
 static int init_ctx(void);
 
-static char *asprintf(const char *fmt, ...)
+static char *xsprintf(const char *fmt, ...)
 {
     va_list ap;
     char *out;
@@ -63,12 +63,12 @@
     int i, j;
 
     args[0] = G_store("g.pnmcat");
-    args[1] = asprintf("base=%s", pref);
-    args[2] = asprintf("output=%s.ppm", pref);
-    args[3] = asprintf("cols=%d", cols);
-    args[4] = asprintf("rows=%d", rows);
-    args[5] = asprintf("width=%d", width);
-    args[6] = asprintf("height=%d", height);
+    args[1] = xsprintf("base=%s", pref);
+    args[2] = xsprintf("output=%s.ppm", pref);
+    args[3] = xsprintf("cols=%d", cols);
+    args[4] = xsprintf("rows=%d", rows);
+    args[5] = xsprintf("width=%d", width);
+    args[6] = xsprintf("height=%d", height);
     args[7] = NULL;
 
     if (G_vspawn_ex(args[0], args) != 0) {