Small change to allow the compiler to optimize it easier due to the constant.

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

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 0fb9494a0007eb31f02f54b5ab306d6ec8fef8b5..f1818260c87c5dfe76d769e916b47ecce3482462 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -598,19 +598,21 @@ int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level)
    /*
     * Save ACLs when requested and available for anything not being a symlink and not being a plugin.
     */
-   if (ff_pkt->flags & FO_ACL && have_acl &&
-       ff_pkt->type != FT_LNK && !ff_pkt->cmd_plugin) {
-      if (!build_acl_streams(jcr, ff_pkt))
-         goto bail_out;
+   if (have_acl) {
+      if (ff_pkt->flags & FO_ACL && ff_pkt->type != FT_LNK && !ff_pkt->cmd_plugin) {
+         if (!build_acl_streams(jcr, ff_pkt))
+            goto bail_out;
+      }
    }
 
    /*
     * Save Extended Attributes when requested and available for all files not being a plugin.
     */
-   if (ff_pkt->flags & FO_XATTR && have_xattr &&
-       !ff_pkt->cmd_plugin) {
-      if (!build_xattr_streams(jcr, ff_pkt))
-         goto bail_out;
+   if (have_xattr) {
+      if (ff_pkt->flags & FO_XATTR && !ff_pkt->cmd_plugin) {
+         if (!build_xattr_streams(jcr, ff_pkt))
+            goto bail_out;
+      }
    }
 
    /* Terminate the signing digest and send it to the Storage daemon */