Changeset 12332 for trunk/Ohana/src/opihi/pantasks

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckTasks.c (modified) (1 diff)
• TaskOps.c (modified) (2 diffs)
• ipptool2book.c (modified) (1 diff)
• task_stdout.c (modified) (2 diffs)

trunk/Ohana/src/opihi/pantasks/CheckTasks.c

@@ -6 +6 @@
   Task *task;
   int status;
-  struct timeval now;
+  // struct timeval now;
 
   /** test all tasks: ready to test? ready to run? **/

trunk/Ohana/src/opihi/pantasks/TaskOps.c

@@ -149 +149 @@
 void ListTaskStats (char *regex) {
 
-  int i, j, valid, nameLength;
-  char *start, *stop;
+  int i, valid, nameLength;
   char format[128];
   regex_t preg;
@@ -557 +556 @@
   if (verbose) {
       fprintf (stderr, "tt: %d %6d  - %d %6d : %f\n", 
-               now.tv_sec, now.tv_usec, 
-               start.tv_sec, start.tv_usec, dtime);
+               (int) now.tv_sec, (int) now.tv_usec, 
+               (int) start.tv_sec, (int) start.tv_usec, dtime);
   }
 

trunk/Ohana/src/opihi/pantasks/ipptool2book.c

@@ -15 +15 @@
   char **setWordValue;
   int setWordN, setWordNalloc;
-  Page *page;
-  Book *book;
-  Queue *queue;
+
+  Page *page = NULL;
+  Book *book = NULL;
+  Queue *queue = NULL;
 
   /* supply additional constant words */

trunk/Ohana/src/opihi/pantasks/task_stdout.c

@@ -3 +3 @@
 int task_stdout (int argc, char **argv) {
 
-  int N, RequiredHost;
   Task *task;
 
@@ -27 +26 @@
 int task_stderr (int argc, char **argv) {
 
-  int N, RequiredHost;
   Task *task;