Fix conio.h problem on Solaris

[bacula/bacula] / bacula / src / dird / ua_status.c

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 71546d31c71150049eb572cf74b18127a5a6ea61..9acb7fd0e5fe857b4f15bc4431040ed52cc65ad0 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -391,7 +391,7 @@ static void list_scheduled_jobs(UAContext *ua)
    int priority;
    bool hdr_printed = false;
    dlist sched;
-   sched_pkt *sp, *ip;
+   sched_pkt *sp;
 
    Dmsg0(200, "enter list_sched_jobs()\n");
 
@@ -420,11 +420,7 @@ static void list_scheduled_jobs(UAContext *ua)
         sp->priority = priority;
         sp->runtime = runtime;
         sp->pool = run->pool;
-        ip = (sched_pkt *)sched.binary_insert(sp, my_compare);
-        if (ip != sp) {
-           /* Identical entry already, we must explictly insert it */
-           sched.insert_after(sp, ip);
-        }
+        sched.binary_insert(sp, my_compare);
         num_jobs++;
       }
    } /* end for loop over resources */
@@ -512,13 +508,13 @@ static void list_running_jobs(UAContext *ua)
         break;
       case JS_WaitFD:
         emsg = (char *) get_pool_memory(PM_FNAME);
-         Mmsg(&emsg, _("is waiting on Client %s"), jcr->client->hdr.name);
+         Mmsg(emsg, _("is waiting on Client %s"), jcr->client->hdr.name);
         pool_mem = true;
         msg = emsg;
         break;
       case JS_WaitSD:
         emsg = (char *) get_pool_memory(PM_FNAME);
-         Mmsg(&emsg, _("is waiting on Storage %s"), jcr->store->hdr.name);
+         Mmsg(emsg, _("is waiting on Storage %s"), jcr->store->hdr.name);
         pool_mem = true;
         msg = emsg;
         break;
@@ -543,7 +539,7 @@ static void list_running_jobs(UAContext *ua)
 
       default:
         emsg = (char *) get_pool_memory(PM_FNAME);
-         Mmsg(&emsg, _("is in unknown state %c"), jcr->JobStatus);
+         Mmsg(emsg, _("is in unknown state %c"), jcr->JobStatus);
         pool_mem = true;
         msg = emsg;
         break;
@@ -571,7 +567,7 @@ static void list_running_jobs(UAContext *ua)
            emsg = (char *) get_pool_memory(PM_FNAME);
            pool_mem = true;
         }
-         Mmsg(&emsg, _("is waiting for Client %s to connect to Storage %s"),
+         Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
              jcr->client->hdr.name, jcr->store->hdr.name);
         msg = emsg;
         break;