From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 24 Oct 2003 16:49:01 +0000 (+0000)
Subject: Fix non-portable var.c + document changes
X-Git-Tag: Release-7.0.0~9944
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=596ceb8de31d96c72bad7b75e7a474913dda4462;p=bacula%2Fbacula

Fix non-portable var.c + document changes


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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 2c9fe3bb61..8b45606729 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,5 +1,8 @@
 
-2003-10-15 Version 1.32c 22Oct03 Beta
+2003-10-24 Version 1.32c 24Oct03 Beta
+24Oct03
+- Fix non-portable varargs code in var.c
+- Make doc fixes/changes suggested by Dan Languille
 23Oct03
 - Document new features.
 - Implement mod of Verify Job at the run prompt.
diff --git a/bacula/kernstodo b/bacula/kernstodo
index 2c3436867c..03d49766b7 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -35,6 +35,8 @@ For 1.33 Testing/Documentation:
 - Document ln -sf /usr/lib/libncurses.so /usr/lib/libtermcap.so
   and install the esound-dev  package for compiling Console on 
   SuSE.
+- Add an example of using a FIFO in dirdconf.wml 
+- Add an item to the FAQ about running jobs in different timezones.
                 
 For 1.32c
 
diff --git a/bacula/src/lib/var.c b/bacula/src/lib/var.c
index 2b0bcb1400..8022a0ab4e 100644
--- a/bacula/src/lib/var.c
+++ b/bacula/src/lib/var.c
@@ -2605,21 +2605,13 @@ var_formatv(
     const char *fmt, va_list ap)
 {
     var_rc_t rc;
-    va_list apbak;
     char *cpBuf;
-    int nBuf;
+    int nBuf = 5000;
 
     /* argument sanity checks */
     if (var == NULL || dst_ptr == NULL || fmt == NULL)
 	return VAR_RC(VAR_ERR_INVALID_ARGUMENT);
 
-    /* determine formatting buffer length */
-    apbak = ap;
-    nBuf = var_mvsnprintf(NULL, 0, fmt, ap);
-    ap = apbak;
-    if (nBuf == -1)
-	return VAR_RC(VAR_ERR_FORMATTING_FAILURE);
-
     /* perform formatting */
     if ((cpBuf = (char *)malloc(nBuf+1)) == NULL)
 	return VAR_RC(VAR_ERR_OUT_OF_MEMORY);
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 500a14a200..cec8cada5e 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -2,8 +2,8 @@
 #undef  VERSION
 #define VERSION "1.32c"
 #define VSTRING "1"
-#define BDATE   "22 Oct 2003"
-#define LSMDATE "22Oct03"
+#define BDATE   "24 Oct 2003"
+#define LSMDATE "24Oct03"
 
 /* Debug flags */
 #undef  DEBUG