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 2c9fe3bb61df4c11014c2e0baf3c5c16e78638a5..8b4560672975865b4ced3016995e489a92774d19 100644 (file)
--- 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 2c3436867c7844626d3ab20a1e6bec59cc10b8c0..03d49766b7fb2a68029a82b548cf253e1befd82c 100644 (file)
--- 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 2b0bcb14004463f3e0b3e4648b00c265b9e39a3a..8022a0ab4ef1ebc22af956e10bc21a8dd98f5e7d 100644 (file)
--- 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 500a14a2009c6e107502b28dc32284877ef9f95a..cec8cada5e58ae90ae9f772ffc3080530a490815 100644 (file)
--- 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