Use dcr more in SD + int to bool conversions

[bacula/bacula] / bacula / src / filed / status.c

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 95cc5f3c70ee64a209b337446049692ce24f16a8..bcb896db6aea26c40b4307a390a5f20b818b14e2 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -7,7 +7,7 @@
  *
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -32,12 +32,6 @@
 extern char my_name[];
 extern int num_jobs_run;
 extern time_t daemon_start_time;
-#ifdef SMARTALLOC
-extern uint64_t sm_max_bytes;
-extern uint64_t sm_bytes;
-extern uint32_t sm_max_buffers;
-extern uint32_t sm_buffers;
-#endif
 
 /* Forward referenced functions */
 static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
@@ -75,7 +69,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
         privs = enable_backup_privileges(NULL, 1);
       }
       len = Mmsg(&msg, 
-         _("Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
+         _(" Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
          p_OpenProcessToken?"":"!",
          p_AdjustTokenPrivileges?"":"!",
          p_LookupPrivilegeValue?"":"!",
@@ -86,7 +80,6 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
       sendit(msg, len, arg);
    }
 #endif
-#ifdef SMARTALLOC
    if (debug_level > 0) {
       len = Mmsg(&msg, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
            edit_uint64_with_commas(sm_bytes, b1),
@@ -95,9 +88,8 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
            edit_uint64_with_commas(sm_max_buffers, b4));
        sendit(msg, len, arg);
     }
-#endif
    if (debug_level > 0) {
-      len = Mmsg(&msg, _("Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
+      len = Mmsg(&msg, _(" Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
            sizeof(size_t));
       sendit(msg, len, arg);
    }
@@ -398,11 +390,12 @@ char *bac_status(char *buf, int buf_len)
          termstat = _("Last Job Canceled");
         break;
       case JS_ErrorTerminated:
+      case JS_FatalError:  
          termstat = _("Last Job Failed");
         break;
       default:
         if (job->Errors) {
-            termstat = _("Last Job had Errors");
+            termstat = _("Last Job had Warnings");
         }
         break;
       }