From d5895f9777ad41e4efaf2fca27209c2fa98ad97b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 25 Apr 2006 19:34:14 +0000 Subject: [PATCH] Fix barcode test, eliminate BOOL (doesn't exist on Linux). git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2970 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/kes-1.39 | 1 + bacula/src/dird/ua_label.c | 2 +- bacula/src/filed/job.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bacula/kes-1.39 b/bacula/kes-1.39 index 6cad2a8e12..9b7b094c83 100644 --- a/bacula/kes-1.39 +++ b/bacula/kes-1.39 @@ -3,6 +3,7 @@ General: 25Apr06 +- Fix barcode test, eliminate BOOL (doesn't exist on Linux). - Write first cut of README.mingw32 - Add back ua_label barcode fix from Rufolf Cejka. - Integrate the majority of the Mingw cross-tools submission diff --git a/bacula/src/dird/ua_label.c b/bacula/src/dird/ua_label.c index d2bee65878..e629a6f124 100644 --- a/bacula/src/dird/ua_label.c +++ b/bacula/src/dird/ua_label.c @@ -307,7 +307,7 @@ static int do_label(UAContext *ua, const char *cmd, int relabel) /* Look for one of the barcode keywords */ if (!relabel && (i=find_arg_keyword(ua, barcode_keyword)) >= 0) { /* Now find the keyword in the list */ - if ((j = find_arg(ua, barcode_keyword[i]))) { + if ((j = find_arg(ua, barcode_keyword[i])) > 0) { *ua->argk[j] = 0; /* zap barcode keyword */ } label_barcodes = true; diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index 4e6d9b3fda..fd29d9a1d9 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -1190,12 +1190,12 @@ static int backup_cmd(JCR *jcr) int SDJobStatus; char ed1[50], ed2[50]; +#ifdef WIN32_VSS // capture state here, if client is backed up by multiple directors // and one enables vss and the other does not then enable_vss can change // between here and where its evaluated after the job completes. - BOOL bDoVSS = FALSE; + bool bDoVSS = false; -#ifdef WIN32_VSS bDoVSS = g_pVSSClient && enable_vss; if (bDoVSS) /* Run only one at a time */ -- 2.39.5