Index: trunk/Ohana/src/opihi/pcontrol/kill.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/kill.c	(revision 3187)
+++ trunk/Ohana/src/opihi/pcontrol/kill.c	(revision 3189)
@@ -4,5 +4,5 @@
 
   Job *job;
-  int JobID;
+  int JobID, N;
 
   if (argc < 2) {
@@ -12,12 +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,5 +25,5 @@
 
   Job *job;
-  int JobID;
+  int JobID, N;
 
   if (argc < 2) {
@@ -32,17 +32,21 @@
   }
   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);