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

[Markus Mohrhard]

 onlineupdate/source/libmar/tool/mar.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d3d9ad14aca343841ab6baaa1aedb50521513285
Author: Markus Mohrhard 
Date:   Fri May 5 14:08:28 2017 +0200

Wdeclaration-after-statement

Change-Id: Ie3a34305c824e2f04feb8b1db39c0df342588c43
Reviewed-on: https://gerrit.libreoffice.org/37797
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/onlineupdate/source/libmar/tool/mar.c 
b/onlineupdate/source/libmar/tool/mar.c
index 232e4e0c220a..d67935bd559d 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -272,10 +272,11 @@ int main(int argc, char **argv) {
   while(fgets(buf, 1000, file) != NULL)
   {
 int j;
+size_t str_len;
 for (j=strlen(buf)-1;j>=0 && (buf[j]=='\n' || buf[j]=='\r');j--)
   ;
 buf[j+1]='\0';
-size_t str_len = strlen(buf) + 1;
+str_len = strlen(buf) + 1;
 files[num_files] = (char*)malloc(sizeof(char)*str_len);
 strcpy(files[num_files], buf);
 ++num_files;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 onlineupdate/source/update/updater/loaddlls.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aca9a99d38af85b2ff4b6912f44571c2d48e147f
Author: Markus Mohrhard 
Date:   Sun Jan 8 21:16:45 2017 +0100

add more TODO comments

diff --git a/onlineupdate/source/update/updater/loaddlls.cxx 
b/onlineupdate/source/update/updater/loaddlls.cxx
index 246d9f8..6a0c8a6 100644
--- a/onlineupdate/source/update/updater/loaddlls.cxx
+++ b/onlineupdate/source/update/updater/loaddlls.cxx
@@ -36,6 +36,7 @@ struct AutoLoadSystemDependencies
 }
 }
 
+// TODO: moggi: do we need all that code?
 // When SetDefaultDllDirectories is not available, fallback to 
preloading
 // dlls. The order that these are loaded does not matter since they are
 // loaded using the LOAD_WITH_ALTERED_SEARCH_PATH flag.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 onlineupdate/source/service/servicebase.hxx   |2 +-
 onlineupdate/source/update/updater/updater.rc |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10933751cee04f5908e9ab01356c03f802a28a34
Author: Markus Mohrhard 
Date:   Tue Dec 27 20:51:52 2016 +0100

use own unique identifier

Change-Id: I6d3b6ca894eceef7ad5757dd7c5b4981eb839c61

diff --git a/onlineupdate/source/service/servicebase.hxx 
b/onlineupdate/source/service/servicebase.hxx
index 0353f7d..abf88a1 100644
--- a/onlineupdate/source/service/servicebase.hxx
+++ b/onlineupdate/source/service/servicebase.hxx
@@ -18,5 +18,5 @@ BOOL VerifySameFiles(LPCWSTR file1Path, LPCWSTR file2Path, 
BOOL );
 // execute the updater it must have this updater identity string in its string
 // table.  No other signed Mozilla product will have this string table value.
 #define UPDATER_IDENTITY_STRING \
-  "libo-updater.exe-4cdccec4-5ee0-4a06-9817-4cd899a9db49"
+  "libreoffice-updater.exe-7bab28a0-0599-4f37-9efe-f7f8b71f05e3"
 #define IDS_UPDATER_IDENTITY 1006
diff --git a/onlineupdate/source/update/updater/updater.rc 
b/onlineupdate/source/update/updater/updater.rc
index bfc8014..1628e78 100644
--- a/onlineupdate/source/update/updater/updater.rc
+++ b/onlineupdate/source/update/updater/updater.rc
@@ -58,7 +58,7 @@ IDI_DIALOG ICON ICON_PATH
 
 STRINGTABLE
 {
-  IDS_UPDATER_IDENTITY, "moz-updater.exe-4cdccec4-5ee0-4a06-9817-4cd899a9db49"
+  IDS_UPDATER_IDENTITY, 
"libreoffice-updater.exe-7bab28a0-0599-4f37-9efe-f7f8b71f05e3"
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits