Remove ifdeffing that turned off JS_Warning status -- must have been missed test...

[bacula/bacula] / bacula / src / wx-console / console_thread.cpp

diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp
index 0d2c0f1294d778c28b472b89434703d59cf9ad6e..50fef3427835734e2559bf314cc686d7f081f955 100644 (file)
--- a/bacula/src/wx-console/console_thread.cpp
+++ b/bacula/src/wx-console/console_thread.cpp
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,12 +15,12 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -278,8 +278,8 @@ console_thread::console_thread() {
 // class destructor
 console_thread::~console_thread() {
    if (UA_sock) {
-      bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
-      bnet_close(UA_sock);
+      UA_sock->signal(BNET_TERMINATE); /* send EOF */
+      UA_sock->close();
       UA_sock = NULL;
    }
 }
@@ -375,7 +375,7 @@ void* console_thread::Entry() {
 
    memset(&jcr, 0, sizeof(jcr));
    
-   jcr.dequeuing = 1; /* TODO: catch messages */
+   jcr.dequeuing_msgs = 1; /* TODO: catch messages */
 
    LockRes();
    /* If cons==NULL, default console will be used */
@@ -466,7 +466,7 @@ void* console_thread::Entry() {
 
    /* main loop */
    while(!TestDestroy()) {   /* Tests if thread has been ended */
-      stat = bnet_wait_data(UA_sock, 10);
+      stat = UA_sock->wait_data(10);
       if (stat == 0) {
          if (last_is_eod) {
             Write(".messages\n");
@@ -476,21 +476,21 @@ void* console_thread::Entry() {
       }
       
       last_is_eod = 0;
-      if ((stat = bnet_recv(UA_sock)) >= 0) {
+      if ((stat = UA_sock->recv()) >= 0) {
          if (do_not_forward_eod) { /* .messages got data: remove the prompt */
             csprint(NULL, CS_REMOVEPROMPT);
          }
          csprint(UA_sock->msg);
       }
       else if (stat == BNET_SIGNAL) {
-         if (UA_sock->msglen == BNET_PROMPT) {
+         if (UA_sock->msglen == BNET_SUB_PROMPT) {
             csprint(NULL, CS_PROMPT);
          } else if (UA_sock->msglen == BNET_EOD) {
             last_is_eod = 1;
             if (!do_not_forward_eod)
                csprint(NULL, CS_END);
          } else if (UA_sock->msglen == BNET_HEARTBEAT) {
-            bnet_sig(UA_sock, BNET_HB_RESPONSE);
+            UA_sock->signal(BNET_HB_RESPONSE);
             csprint(_("<< Heartbeat signal received, answered. >>\n"), CS_DEBUG);
          } else if (UA_sock->msglen == BNET_START_SELECT ||
                     UA_sock->msglen == BNET_END_SELECT) {
@@ -506,7 +506,7 @@ void* console_thread::Entry() {
          break;
       }
            
-      if (is_bnet_stop(UA_sock)) {
+      if (UA_sock->is_stop()) {
          csprint(NULL, CS_END);
          break;            /* error or term */
       }
@@ -534,7 +534,7 @@ void console_thread::Write(const char* str)
    if (UA_sock) {
       UA_sock->msglen = (int32_t)strlen(str);
       pm_strcpy(&UA_sock->msg, str);
-      bnet_send(UA_sock);
+      UA_sock->send();
    } else if (choosingdirector) {
 //      wxString number = str;
 //      number.RemoveLast(); /* Removes \n */
@@ -553,8 +553,8 @@ void console_thread::Write(const char* str)
 void console_thread::Delete() {
    Write("quit\n");
    if (UA_sock) {
-      bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
-      bnet_close(UA_sock);
+      UA_sock->signal(BNET_TERMINATE); /* send EOF */
+      UA_sock->close();
       UA_sock = NULL;
       /*csprint(NULL, CS_END);
       csprint(NULL, CS_DISCONNECTED);