Eliminate a couple of compiler warnings

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

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 07bbc264d1c4ca6e25947988c4d3a66c0a71afc3..9525a0579cfce14c424272dbcbd68897cefdf2f5 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -832,8 +832,8 @@ int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest,
       if (ff_pkt->flags & FO_SPARSE) {
          ser_declare;
          bool allZeros = false;
-         if (sd->msglen == rsize &&
-             fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size ||
+         if ((sd->msglen == rsize &&
+              fileAddr+sd->msglen < (uint64_t)ff_pkt->statp.st_size) ||
              ((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) &&
                (uint64_t)ff_pkt->statp.st_size == 0)) {
             allZeros = is_buf_zero(rbuf, rsize);

diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c
index 424f178f6207878d324504617d6023698bbfc5dd..257a51618de94afbdc9cb0b60c1124359f61e3d3 100644 (file)
--- a/bacula/src/filed/verify.c
+++ b/bacula/src/filed/verify.c
@@ -347,8 +347,8 @@ static int read_digest(BFILE *bfd, DIGEST *digest, JCR *jcr)
       /* Check for sparse blocks */
       if (ff_pkt->flags & FO_SPARSE) {
          bool allZeros = false;
-         if (n == bufsiz &&
-             fileAddr+n < (uint64_t)ff_pkt->statp.st_size ||
+         if ((n == bufsiz &&
+              fileAddr+n < (uint64_t)ff_pkt->statp.st_size) ||
              ((ff_pkt->type == FT_RAW || ff_pkt->type == FT_FIFO) &&
                (uint64_t)ff_pkt->statp.st_size == 0)) {
             allZeros = is_buf_zero(buf, bufsiz);

diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c
index c2d39dc3dd3bd5e609c1d6a46d246f26fe6a6ec0..87ab2c327d75e6425f8a0f64674d66269d12f613 100644 (file)
--- a/bacula/src/lib/base64.c
+++ b/bacula/src/lib/base64.c
@@ -177,7 +177,7 @@ bin_to_base64(char *buf, int buflen, char *bin, int binlen, int compatible)
    if (rem && j < buflen) {
       mask = (1 << rem) - 1;
       if (compatible) {
-         buf[j++] = base64_digits[(reg & mask) << 6 - rem];
+         buf[j++] = base64_digits[(reg & mask) << (6 - rem)];
       } else {
          buf[j++] = base64_digits[reg & mask];
       }