[Libreoffice-commits] core.git: Branch 'feature/mar-updater' - 2 commits - onlineupdate/source

[Markus Mohrhard]

 onlineupdate/source/mbsdiff/bsdiff.cxx               |    6 +++---
 onlineupdate/source/update/updater/archivereader.cxx |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 189ada7e347bf6b2b886ab3122aaf5aa26e9467d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 5 14:05:28 2017 +0200

    Wsometimes-uninitialized
    
    Change-Id: Ia160685694a386358506f94c4cc1510e5e2a6f62

diff --git a/onlineupdate/source/mbsdiff/bsdiff.cxx b/onlineupdate/source/mbsdiff/bsdiff.cxx
index ef80bd99770f..d455bf98046d 100644
--- a/onlineupdate/source/mbsdiff/bsdiff.cxx
+++ b/onlineupdate/source/mbsdiff/bsdiff.cxx
@@ -212,9 +212,9 @@ search(int32_t *I,unsigned char *old,int32_t oldsize,
 int main(int argc,char *argv[])
 {
     int fd;
-    unsigned char *old,*newbuf;
-    int32_t oldsize,newsize;
-    int32_t *I,*V;
+    unsigned char *old = nullptr,*newbuf = nullptr;
+    int32_t oldsize = 0,newsize = 0;
+    int32_t *I = nullptr,*V = nullptr;
 
     int32_t scan,pos,len;
     int32_t lastscan,lastpos,lastoffset;
commit 234ad04a603c5968c057c5857a854058b2188c75
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 5 14:03:07 2017 +0200

    Wunused-macros
    
    Change-Id: Ib50bd405101acb908831d943d449c3cf86b2ac85

diff --git a/onlineupdate/source/update/updater/archivereader.cxx b/onlineupdate/source/update/updater/archivereader.cxx
index ec043680c27e..bb548b919a0b 100644
--- a/onlineupdate/source/update/updater/archivereader.cxx
+++ b/onlineupdate/source/update/updater/archivereader.cxx
@@ -25,7 +25,9 @@
 #endif
 #endif
 
+#if defined(_WIN32)
 #define UPDATER_NO_STRING_GLUE_STL
+#endif
 #include "nsVersionComparator.h"
 #undef UPDATER_NO_STRING_GLUE_STL