Tweaks + svn ignores

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7560 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 5219780c41229031149ffbf9353ed19087e5515d..6fd3d96be11772275b4fbfa21a5d68479f063017 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -352,7 +352,7 @@ int wait_for_job_termination(JCR *jcr, int timeout)
 
    if (fd) {
       if (timeout) {
-         tid = start_bsock_timer(fd, timeout); /* TODO: use user timeout */
+         tid = start_bsock_timer(fd, timeout); /* TODO: New timeout directive??? */
       }
       /* Wait for Client to terminate */
       while ((n = bget_dirmsg(fd)) >= 0) {

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index 52919a935219530a4ba3b9ab98b6db574fa5fc4b..f03d5c31eb0b859ba0e14003a06c8d45dd0a176d 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -1,6 +1,3 @@
-/*
- * Properties we use for getting and setting ACLs.
- */
 /*
    Bacula® - The Network Backup Solution
 
@@ -28,6 +25,9 @@
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * Properties we use for getting and setting ACLs.
+ */
 
 #ifndef _BACULA_ACL_
 #define _BACULA_ACL_

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index efb76029d654fc00e9150ee54c23ea5754589972..c18506d865731ba241791a07db1c0ab47c55325e 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -461,7 +461,6 @@ int DCR::check_volume_label(bool &ask, bool &autochanger)
       case try_default:
          break;
       }
-
       /* NOTE! Fall-through wanted. */
    case VOL_NO_MEDIA:
    default: