Index: trunk/Ohana/src/opihi/include/pantasks.h
===================================================================
--- trunk/Ohana/src/opihi/include/pantasks.h	(revision 12404)
+++ trunk/Ohana/src/opihi/include/pantasks.h	(revision 12840)
@@ -138,16 +138,17 @@
   Task   *task;
 
-  IOBuffer    stdout;			/* stdout storage buffer */
-  IOBuffer    stderr;			/* stderr storage buffer */
+  /* this cries out for another structure... */
+  IOBuffer    stdout_buff;    /* stdout storage buffer */
+  char       *stdout_dump;    // output target file for stdout
+  int         stdout_size;    /* size of pending stdout buffer (controller) */
+  int         stdout_fd;      /* stdout pipe (local only) */
+
+  IOBuffer    stderr_buff;    /* stderr storage buffer */
+  char       *stderr_dump;    // output target file for stderr
+  int         stderr_size;    /* size of pending stderr buffer (controller) */
+  int         stderr_fd;      /* stderr pipe (local only) */
+
   JobMode     mode;			/* local or controller? */
-
-  char   *stdout_dump;
-  char   *stderr_dump;
   char   *realhost;
-
-  int         stdout_size;		/* size of pending stdout buffer (controller) */
-  int         stderr_size;		/* size of pending stderr buffer (controller) */
-  int         stdout_fd;		/* stdout pipe (local only) */
-  int         stderr_fd;		/* stderr pipe (local only) */
 
   double dtime;