Win32 fixes

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

diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c
index 491212b0f65b2e9f57cd49ef635a5da2ee6f3c43..cec5e72b0d68bd5a9875f9334f422b46c3b58d3e 100644 (file)
--- a/bacula/src/dird/dird_conf.c
+++ b/bacula/src/dird/dird_conf.c
@@ -1090,9 +1090,6 @@ void save_resource(int type, RES_ITEM *items, int pass)
    }
    /* Common */
    if (!error) {
-      if (type == R_JOBDEFS) {
-         Dmsg0(200, "Storing JobDefs definition.\n");
-      }
       res = (URES *)malloc(size);
       memcpy(res, &res_all, size);
       if (!resources[rindex].res_head) {

diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c
index a82efb4d795776a89358427181e9ee88fd6fe084..05834e602015b76e2087f9d4abff8c7a9ca9ba21 100644 (file)
--- a/bacula/src/dird/verify.c
+++ b/bacula/src/dird/verify.c
@@ -127,8 +127,8 @@ int do_verify(JCR *jcr)
    }
 
    /* Print Job Start message */
-   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId %d Job=%s\n"),
-      jcr->JobId, jcr->Job);
+   Jmsg(jcr, M_INFO, 0, _("Start Verify JobId=%d Level=%s Job=%s\n"),
+      jcr->JobId, level_to_str(jcr->JobLevel), jcr->Job);
 
    /*
     * Now get the job record for the previous backup that interests
@@ -290,7 +290,8 @@ int do_verify(JCR *jcr)
       level="disk_to_catalog";
       break;
    default:
-      Jmsg1(jcr, M_FATAL, 0, _("Unimplemented save level %d\n"), jcr->JobLevel);
+      Jmsg2(jcr, M_FATAL, 0, _("Unimplemented save level %d(%c)\n"), jcr->JobLevel,
+        jcr->JobLevel);
       goto bail_out;
    }
 

diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index 36a7d2afac6fcf007bbfb898df0897bde02a0b6b..fc3476aa3f3affa79b8823d4a184b580a6b5c981 100755 (executable)
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -132,7 +132,8 @@ find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
 
       /* Search link list of hard linked files */
       for (lp = ff_pkt->linklist; lp; lp = lp->next)
-        if (lp->ino == ff_pkt->statp.st_ino && lp->dev == ff_pkt->statp.st_dev) {
+        if (lp->ino == (ino_t)ff_pkt->statp.st_ino && 
+            lp->dev == (dev_t)ff_pkt->statp.st_dev) {
              /* If we have already backed up the hard linked file don't do it again */
             if (strcmp(lp->name, fname) == 0) {
                 Jmsg1(jcr, M_WARNING, 0, _("Attempt to backup hard linked file %s twice ignored.\n"),

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 89eb4a18e54620800129561e2268cda0191759de..a33d94ca73e41be85f755eac0f33560f77dd2532 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.34.3"
 #define VSTRING "1"
-#define BDATE   "30 May 2004"
-#define LSMDATE "28May04"
+#define BDATE   "31 May 2004"
+#define LSMDATE "31May04"
 
 /* Debug flags */
 #undef  DEBUG