From 8eab71e0b362ad4ee88c511e475b10514c4bbbde Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 30 Oct 2008 12:06:26 +0000 Subject: [PATCH] Fix picky compiler warnings git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7949 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/filed/backup.c | 4 ++-- bacula/src/lib/base64.c | 4 ++-- bacula/src/stored/status.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c index 7cdb2c8058..802282f187 100644 --- a/bacula/src/filed/backup.c +++ b/bacula/src/filed/backup.c @@ -769,8 +769,8 @@ int send_data(JCR *jcr, int stream, FF_PKT *ff_pkt, DIGEST *digest, if (ff_pkt->flags & FO_SPARSE) { ser_declare; bool haveBlock = true; - 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)) { haveBlock = !is_buf_zero(rbuf, rsize); diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c index 0f69ca7e2c..87ab2c327d 100644 --- a/bacula/src/lib/base64.c +++ b/bacula/src/lib/base64.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. @@ -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]; } diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c index d50bc19e05..3dc02b0e7d 100644 --- a/bacula/src/stored/status.c +++ b/bacula/src/stored/status.c @@ -378,7 +378,7 @@ static void list_running_jobs(void sendit(const char *msg, int len, void *sarg), } dcr = jcr->dcr; rdcr = jcr->read_dcr; - if ((dcr && dcr->device) || rdcr && rdcr->device) { + if ((dcr && dcr->device) || (rdcr && rdcr->device)) { bstrncpy(JobName, jcr->Job, sizeof(JobName)); /* There are three periods after the Job name */ char *p; -- 2.39.5