From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 6 Nov 2005 18:20:55 +0000 (+0000)
Subject: Fix switch in bfile.c
X-Git-Tag: Release-1.38.1~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=270772c9bd3785db9cd39df91c5223a1ac3a6720;p=bacula%2Fbacula

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 19ffcc39d6..43dce6a7e6 100644
--- 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 1f3e6eb25f..573e294da1 100644
--- 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 d41d971077..b431327b9a 100644
--- 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 625d577e89..e696708418 100644
--- 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 */