Add heap stats to Dir and SD -- eliminate #ifdefs

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

diff --git a/bacula/src/dird/newvol.c b/bacula/src/dird/newvol.c
index 40c21127d7e42a78aaf4f959bb591f453e106b0b..0863e67014b4ad026b1db2df2060a3c30ae368e9 100644 (file)
--- a/bacula/src/dird/newvol.c
+++ b/bacula/src/dird/newvol.c
@@ -13,7 +13,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2001-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
@@ -43,7 +43,7 @@ static int perform_full_name_substitution(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)
 /*
  * Automatic Volume name creation using the LabelFormat
  */
-int newVolume(JCR *jcr, MEDIA_DBR *mr)
+bool newVolume(JCR *jcr, MEDIA_DBR *mr)
 {
    POOL_DBR pr;
 
@@ -81,7 +81,7 @@ int newVolume(JCR *jcr, MEDIA_DBR *mr)
            db_unlock(jcr->db);
             Jmsg(jcr, M_INFO, 0, _("Created new Volume \"%s\" in catalog.\n"), mr->VolumeName);
             Dmsg1(90, "Created new Volume=%s\n", mr->VolumeName);
-           return 1;
+           return true;
         } else {
             Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
         }
@@ -89,7 +89,7 @@ int newVolume(JCR *jcr, MEDIA_DBR *mr)
    }
 bail_out:
    db_unlock(jcr->db);
-   return 0;   
+   return false;
 }
 
 static int create_simple_name(JCR *jcr, MEDIA_DBR *mr, POOL_DBR *pr)