Fix some compiler warnings and fix windows build.

bareos · Feb 17, 2015 · e8cb410 · e8cb410
1 parent e5cdb0b
commit e8cb410
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/src/lib/md5.c b/src/lib/md5.c
@@ -164,7 +164,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (uint32_t *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));        /* In case it's sensitive */
+    memset(ctx, 0, sizeof(MD5Context)); /* In case it's sensitive */
 }
 
 

diff --git a/src/lib/var.c b/src/lib/var.c
@@ -2408,7 +2408,7 @@ var_create(
         return VAR_RC(VAR_ERR_INVALID_ARGUMENT);
     if ((var = (var_t *)malloc(sizeof(var_t))) == NULL)
         return VAR_RC(VAR_ERR_OUT_OF_MEMORY);
-    memset(var, 0, sizeof(var));
+    memset(var, 0, sizeof(var_t));
     var_config(var, VAR_CONFIG_SYNTAX, &var_syntax_default);
     *pvar = var;
     return VAR_OK;

diff --git a/src/win32/filed/Makefile b/src/win32/filed/Makefile
@@ -24,10 +24,10 @@ endif
 LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
 	 ../findlib/libbareosfind.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/liblzo2.dll.a \
          $(MINGW_LIB)/libfastlz.dll.a \
+         $(MINGW_LIB)/libpthreadGCE2.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32
 
 SVRSRCS = accurate.c authenticate.c backup.c compression.c \
@@ -41,7 +41,6 @@ SVROBJS = $(SVRSRCS:.c=.o)
 WINDRESSRCS = filedres.rc
 WINDRESOBJS = $(WINDRESSRCS:.rc=.o)
 
-
 all: bareos-fd.exe
 
 bareos-fd.exe: DLL_USAGE = -DUSING_DLL

diff --git a/src/win32/filed/filedres.rc b/src/win32/filed/filedres.rc
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Bareos GmbH & Co. KG"
       VALUE "FileDescription", "Bareos File Daemon"
-      VALUE "FileVersion", "12.4.2"
+      VALUE "FileVersion", "13.2.0"
       VALUE "InternalName", "bareos-fd.exe"
       VALUE "LegalCopyright", "See LICENSE File"
       VALUE "OriginalFilename", "bareos-fd.exe"
       VALUE "ProductName", "Bareos File Daemon"
-      VALUE "ProductVersion", "12.4.2"
+      VALUE "ProductVersion", "13.2.0"
     END
   END
 

diff --git a/src/win32/lib/Makefile b/src/win32/lib/Makefile
@@ -20,20 +20,23 @@ LDLIBS = $(MINGW_LIB)/libssl.dll.a \
          $(MINGW_LIB)/libcrypto.dll.a \
          $(MINGW_LIB)/libpthreadGCE2.a \
          $(MINGW_LIB)/libz.dll.a \
-	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid
+         $(MINGW_LIB)/liblzo2.dll.a \
+         $(MINGW_LIB)/libfastlz.dll.a \
+         $(WINSOCKLIB) -lole32 -loleaut32 -luuid
 
 LIBBAREOS_SRCS =  address_conf.c alist.c attr.c attribs.c base64.c \
 		  berrno.c bget_msg.c binflate.c bnet_server.c bnet.c \
 		  bpipe.c breg.c bregex.c bsnprintf.c bsock.c bsys.c \
-		  btime.c btimers.c cram-md5.c crypto.c crypto_cache.c \
-		  crypto_gnutls.c crypto_none.c crypto_nss.c crypto_openssl.c \
-		  crypto_wrap.c daemon.c devlock.c dlist.c edit.c fnmatch.c \
-		  guid_to_name.c hmac.c htable.c jcr.c lockmgr.c md5.c \
-		  mem_pool.c message.c mntent_cache.c passphrase.c plugins.c \
-		  poll.c priv.c queue.c rblist.c runscript.c rwlock.c scan.c \
-		  scsi_crypto.c scsi_lli.c sellist.c serial.c sha1.c signal.c \
-		  smartall.c tls_gnutls.c tls_none.c tls_nss.c tls_openssl.c \
-		  tree.c util.c var.c watchdog.c workq.c
+		  btime.c btimers.c compression.c cram-md5.c crypto.c \
+		  crypto_cache.c crypto_gnutls.c crypto_none.c crypto_nss.c \
+		  crypto_openssl.c crypto_wrap.c daemon.c devlock.c dlist.c \
+		  edit.c fnmatch.c guid_to_name.c hmac.c htable.c jcr.c \
+		  lockmgr.c md5.c mem_pool.c message.c mntent_cache.c \
+		  passphrase.c plugins.c poll.c priv.c queue.c rblist.c \
+		  runscript.c rwlock.c scan.c scsi_crypto.c scsi_lli.c \
+		  sellist.c serial.c sha1.c signal.c smartall.c tls_gnutls.c \
+		  tls_none.c tls_nss.c tls_openssl.c tree.c util.c var.c \
+		  watchdog.c workq.c
 LIBBAREOS_OBJS = $(LIBBAREOS_SRCS:.c=.o)
 
 LIBBAREOSCFG_SRCS = ini.c lex.c parse_bsr.c