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

Timestamp:

Jun 26, 2012, 11:46:01 AM (14 years ago)

Author:

eugene

Message:

updates for pedantic gcc, mods to relphot average mags to handle GPC1 stacks

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• ControllerOps.c (modified) (6 diffs)
• client_shell.c (modified) (2 diffs)
• task.c (modified) (2 diffs)

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

@@ -63 +63 @@
 int CheckControllerJob (Job *job) {
   struct timeval start, stop;
-  float dtime;
 
   gettimeofday (&start, (void *) NULL);
   CheckControllerJobStatus (job);
   gettimeofday (&stop, (void *) NULL);
-  dtime = DTIME (stop, start);
-  /* if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime); */
+  // float dtime = DTIME (stop, start);
+  // if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime);
 
   if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
@@ -75 +74 @@
     GetJobOutput ("stdout", job[0].pid, &job[0].stdout_buff, job[0].stdout_size);
     gettimeofday (&stop, (void *) NULL);
-    dtime = DTIME (stop, start);
+    // float dtime = DTIME (stop, start);
     /* if (VerboseMode()) gprint (GP_ERR, "get stdout %f\n", dtime); */
 
@@ -81 +80 @@
     GetJobOutput ("stderr", job[0].pid, &job[0].stderr_buff, job[0].stderr_size);
     gettimeofday (&stop, (void *) NULL);
-    dtime = DTIME (stop, start);
+    // float dtime = DTIME (stop, start);
     /* if (VerboseMode()) gprint (GP_ERR, "get stderr %f\n", dtime); */
 
@@ -87 +86 @@
     DeleteControllerJob (job);
     gettimeofday (&stop, (void *) NULL);
-    dtime = DTIME (stop, start);
+    // float dtime = DTIME (stop, start);
     /* if (VerboseMode()) gprint (GP_ERR, "delete job %f\n", dtime); */
   }  
@@ -578 +577 @@
 int QuitController () {
 
-  int status;
   char cmd[128];
   IOBuffer buffer;
@@ -586 +584 @@
   sprintf (cmd, "quit");
   InitIOBuffer (&buffer, 0x100);
-  status = ControllerCommand (cmd, NULL, &buffer);
+  ControllerCommand (cmd, NULL, &buffer);
   FreeIOBuffer (&buffer);
 

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

@@ -4 +4 @@
 int client_shell (int argc, char **argv) {
 
-  int Nbad, status;
+  int Nbad;
   char *line, *prompt, *history;
   pid_t ppid;
@@ -41 +41 @@
 
     if (*line) {
-        status = multicommand (line);
+      // status = multicommand (line); do something different if false?
+        multicommand (line);
         add_history (line);
         append_history (1, history);

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

@@ -5 +5 @@
 
   int hash;
-  int ThisList, status;
+  int ThisList;
   char *input, *outline;
   Task *task;
@@ -82 +82 @@
       case TASK_NPENDING:
       case TASK_ACTIVE:
-        status = command (input, &outline, TRUE);
+        // status = command(); do something with this info?
+        command (input, &outline, TRUE);
         if (outline != NULL) free (outline);
-        /* what to do if command is invalid?
-           if (!status) return (FALSE); */
         break;