[GRASS-SVN] r37616 - grass/branches/develbranch_6/lib/gis

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-30 10:21:05 -0400 (Sat, 30 May 2009)
New Revision: 37616

Modified:
   grass/branches/develbranch_6/lib/gis/spawn.c
Log:
undo overmerge from trunk r37193(r34695)

Modified: grass/branches/develbranch_6/lib/gis/spawn.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/spawn.c	2009-05-30 12:30:07 UTC (rev 37615)
+++ grass/branches/develbranch_6/lib/gis/spawn.c	2009-05-30 14:21:05 UTC (rev 37616)
@@ -221,18 +221,18 @@
     return env;
 }
 
-static int do_spawn(struct spawn *sp, const char *command)
+static int do_spawn(const char *command)
 {
     char **env;
     int status;
 
-    do_redirects(sp->redirects, sp->num_redirects);
-    env = do_bindings(_environ, sp->bindings, sp->num_bindings);
+    do_redirects(redirects, num_redirects);
+    env = do_bindings(_environ, bindings, num_bindings);
 
     status =
-	spawnvpe(sp->background ? _P_NOWAIT : _P_WAIT, command, sp->args, env);
+	spawnvpe(background ? _P_NOWAIT : _P_WAIT, command, args, env);
 
-    if (!sp->background && status < 0)
+    if (!background && status < 0)
 	G_warning(_("Unable to execute command"));
 
     return status;