Misc

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

diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 9904468003834950c38a159adc8fb6cea420c95c..1d144ead37f3d3c9945af83ba5a5029bf69de588 100644 (file)
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -551,7 +551,7 @@ static void list_terminated_jobs(UAContext *ua)
    lock_last_jobs_list();
    struct s_last_job *je;
    bsendmsg(ua, _("\nTerminated Jobs:\n"));
-   bsendmsg(ua, _(" JobId  Level   Files          Bytes Status   Finished        Name \n"));
+   bsendmsg(ua, _(" JobId  Level   Files      Bytes     Status   Finished        Name \n"));
    bsendmsg(ua, _("======================================================================\n"));
    foreach_dlist(je, last_jobs) {
       char JobName[MAX_NAME_LENGTH];

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index e53d8bfbd654abb275af5cb2d67fec41ac646327..e42d2dab79569be0076596a3b2591336cd5e9850 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -367,7 +367,7 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
       /* 
        * Read the file data
        */
-      while ((sd->msglen=bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
+      while ((sd->msglen=(uint32_t)bread(&ff_pkt->bfd, rbuf, rsize)) > 0) {
         int sparseBlock = 0;
 
         /* Check for sparse blocks */

diff --git a/bacula/src/filed/verify.c b/bacula/src/filed/verify.c
index 2957cfc9f28e9dc849e05dda0fd84aa284079fa8..d094d0bb91bed0b7bb3043b405996888ab8d727c 100644 (file)
--- a/bacula/src/filed/verify.c
+++ b/bacula/src/filed/verify.c
@@ -65,7 +65,7 @@ void do_verify(JCR *jcr)
 static int verify_file(FF_PKT *ff_pkt, void *pkt) 
 {
    char attribs[MAXSTRING];
-   int32_t n;
+   int64_t n;
    int stat;
    BFILE bfd;
    struct MD5Context md5c;

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 41312daf684d4f34b90c3f99351457c6a8918eaa..78f4abe50a61e3312819432114d295be4c748f51 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -377,10 +377,13 @@ void read_state_file(char *dir, const char *progname, int port)
    if ((sfd = open(mp_chr(fname), O_RDONLY, 0)) < 0 ||
        read(sfd, &hdr, sizeof(hdr)) < 0 ||
        hdr.version != state_hdr.version) {
+      Dmsg2(000, "Could not open or read state file. sfd=%d: ERR=%s\n",
+           sfd, strerror(errno));
       goto bail_out;
    }
    hdr.id[13] = 0;
    if (strcmp(hdr.id, state_hdr.id) != 0) {
+      Dmsg0(000, "State file header invalid.\n");
       goto bail_out;
    }
    read_last_jobs_list(sfd, hdr.last_jobs_addr);

diff --git a/bacula/src/lib/edit.c b/bacula/src/lib/edit.c
index a55de70e081f680f33dec53b53f58c5d583828dd..ec5262890f7728ca3b896a736122cd29dd20decd 100644 (file)
--- a/bacula/src/lib/edit.c
+++ b/bacula/src/lib/edit.c
@@ -195,7 +195,7 @@ char *edit_utime(utime_t val, char *buf)
 
    *buf = 0;
    for (i=0; i<5; i++) {
-      times = val / mult[i];
+      times = (uint32_t)(val / mult[i]);
       if (times > 0) {
         val = val - (utime_t)times * mult[i];
          sprintf(mybuf, "%d %s%s ", times, mod[i], times>1?"s":"");