From dd271de979f8f816448d10c675831a821c5049bc Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 8 Sep 2008 12:09:23 +0000 Subject: [PATCH] Tweaks + svn ignores git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7560 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/backup.c | 2 +- bacula/src/filed/acl.h | 6 +++--- bacula/src/stored/mount.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 5219780c41..6fd3d96be1 100644 --- 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 52919a9352..f03d5c31eb 100644 --- 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 efb76029d6..c18506d865 100644 --- 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: -- 2.39.5