Changeset 3189 for trunk/Ohana/src/opihi/pcontrol/kill.c

Timestamp:

Feb 11, 2005, 8:45:09 AM (21 years ago)

Author:

eugene

Message:

pcontrol work

File:

• trunk/Ohana/src/opihi/pcontrol/kill.c (modified) (4 diffs)

trunk/Ohana/src/opihi/pcontrol/kill.c

@@ -4 +4 @@
 
   Job *job;
-  int JobID;
+  int JobID, N;
 
   if (argc < 2) {
@@ -12 +12 @@
   JobID = atoi (argv[1]);
 
-  job = FindJob (JobID, PCONTROL_JOB_BUSY);
-  if (job != NULL) {
-    KillJob (job);
-    return (TRUE);
+  N = FindJob (JobID, PCONTROL_JOB_BUSY);
+  if (N < 0) {
+    fprintf (stderr, "job %s not BUSY\n", argv[1]);
+    return (FALSE);
   }
-
-  fprintf (stderr, "job %s not BUSY\n", argv[1]);
-  return (FALSE);
+  job = GetJob (PCONTROL_JOB_BUSY, N);
+  KillJob (job);
+  return (TRUE);
 }
 
@@ -25 +25 @@
 
   Job *job;
-  int JobID;
+  int JobID, N;
 
   if (argc < 2) {
@@ -32 +32 @@
   }
   JobID = atoi (argv[1]);
+  /* use a string interp to convert JobIDs to ints ? */
 
-  job = FindJob (JobID, PCONTROL_JOB_PENDING);
-  if (job != NULL) {
+  N = FindJob (JobID, PCONTROL_JOB_PENDING);
+  if (N >= 0) {
+    job = GetJob (PCONTROL_JOB_PENDING, N);
     DelJob (job);
     return (TRUE);
   }
-  job = FindJob (JobID, PCONTROL_JOB_CRASH);
-  if (job != NULL) {
+  N = FindJob (JobID, PCONTROL_JOB_CRASH);
+  if (N >= 0) {
+    job = GetJob (PCONTROL_JOB_CRASH, N);
     DelJob (job);
     return (TRUE);
   }
-  job = FindJob (JobID, PCONTROL_JOB_EXIT);
-  if (job != NULL) {
+  N = FindJob (JobID, PCONTROL_JOB_EXIT);
+  if (N >= 0) {
+    job = GetJob (PCONTROL_JOB_EXIT, N);
     DelJob (job);
     return (TRUE);