Fix switch in bfile.c

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

diff --git a/bacula/src/findlib/bfile.c b/bacula/src/findlib/bfile.c
index 19ffcc39d61e2edc679e70a48fce4c9583a89e45..43dce6a7e646235e7449e8f24ea30858f10eb5a5 100644 (file)
--- a/bacula/src/findlib/bfile.c
+++ b/bacula/src/findlib/bfile.c
@@ -634,7 +634,7 @@ bool set_prog(BFILE *bfd, char *prog, JCR *jcr)
 bool is_stream_supported(int stream)
 {
    /* No Win32 backup on this machine */
-/*   switch (stream) {
+     switch (stream) {
 #ifndef HAVE_LIBZ
    case STREAM_GZIP_DATA:
    case STREAM_SPARSE_GZIP_DATA:
@@ -648,7 +648,6 @@ bool is_stream_supported(int stream)
    case STREAM_HFSPLUS_ATTRIBUTES:
 #endif
       return false;
-*/
 
    /* Known streams */
 #ifdef HAVE_LIBZ

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index 1f3e6eb25f3af1c325bb1f7724663923f8eaf1b9..573e294da1f6e4c6f387ac51dcc6437f2d00081e 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -24,7 +24,7 @@ dummy:
 
 LIBSRCS = alloc.c attr.c base64.c berrno.c bsys.c bget_msg.c \
          bnet.c bnet_server.c \
-         bpipe.c bshm.c btime.c \
+         bpipe.c bshm.c bsnprintf.c btime.c \
          cram-md5.c crc32.c daemon.c edit.c fnmatch.c \
          hmac.c idcache.c jcr.c lex.c alist.c dlist.c \
          md5.c message.c mem_pool.c parse_conf.c \
@@ -37,7 +37,7 @@ LIBSRCS = alloc.c attr.c base64.c berrno.c bsys.c bget_msg.c \
 
 LIBOBJS = alloc.o attr.o base64.o berrno.o bsys.o bget_msg.o \
          bnet.o bnet_server.o \
-         bpipe.o bshm.o btime.o \
+         bpipe.o bshm.o bsnprintf.o btime.o \
          cram-md5.o crc32.o daemon.o edit.o fnmatch.o \
          hmac.o idcache.o jcr.o lex.o alist.o dlist.o \
          md5.o message.o mem_pool.o parse_conf.o \

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index d41d971077e1f040925d71b410f20390a9e6ea76..b431327b9ac6548eecf8769f941deeed9d6daab9 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -216,6 +216,8 @@ void *bcalloc (size_t size1, size_t size2)
    return buf;
 }
 
+/* Code now in src/lib/bsnprintf.c */
+#ifndef DEVELOPER
 
 #define BIG_BUF 5000
 /*
@@ -259,6 +261,7 @@ int bvsnprintf(char *str, int32_t size, const char  *format, va_list ap)
    return len;
 #endif
 }
+#endif /* DEVELOPER */
 
 #ifndef HAVE_LOCALTIME_R
 

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 625d577e8905cc6e407a2218c7a4a496af424571..e69670841813369536298f4e042bf5298524aaab 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -15,7 +15,7 @@
 #define TRACE_FILE 1
 
 /* If this is set stdout will not be closed on startup */
-/* #define DEVELOPER 1 */
+#define DEVELOPER 1
 
 /* Debug flags not normally turned on */