mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work around Werror=format-truncation in onlineupdate for now

Browse Source 
Change-Id: I6230cc8c76313b5d180ef3fbebec4bc20b794150
Reviewed-on: https://gerrit.libreoffice.org/67879
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2019-02-15 16:37:58 +01:00
parent 6b13784a14
commit eaabda554c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
onlineupdate/source/update/updater/updater.cxx
View File

@@ -1604,8 +1604,9 @@ PatchFile::Prepare()
// extract the patch to a temporary file // extract the patch to a temporary file
mPatchIndex = sPatchIndex++; mPatchIndex = sPatchIndex++;
NS_tsnprintf(spath, sizeof(spath)/sizeof(spath[0]), int nWrittenBytes = NS_tsnprintf(spath, sizeof(spath)/sizeof(spath[0]),
NS_T("%s/updating/%d.patch"), gWorkingDirPath, mPatchIndex); NS_T("%s/updating/%d.patch"), gWorkingDirPath, mPatchIndex);
(void) nWrittenBytes;
NS_tremove(spath); NS_tremove(spath);
@@ -2491,8 +2492,9 @@ ProcessReplaceRequest()
// need to have the last-update.log and backup-update.log files moved from the // need to have the last-update.log and backup-update.log files moved from the
// old installation directory to the new installation directory. // old installation directory to the new installation directory.
NS_tchar tmpLog[MAXPATHLEN]; NS_tchar tmpLog[MAXPATHLEN];
NS_tsnprintf(tmpLog, sizeof(tmpLog)/sizeof(tmpLog[0]), int nWrittenBytes = NS_tsnprintf(tmpLog, sizeof(tmpLog)/sizeof(tmpLog[0]),
NS_T("%s/updates/last-update.log"), tmpDir); NS_T("%s/updates/last-update.log"), tmpDir);
(void) nWrittenBytes;
if (!NS_taccess(tmpLog, F_OK)) if (!NS_taccess(tmpLog, F_OK))
{ {
NS_tchar destLog[MAXPATHLEN]; NS_tchar destLog[MAXPATHLEN];
@@ -2672,7 +2674,7 @@ CheckSignature(ArchiveReader& archiveReader)
// TODO: moggi: needs adaption for LibreOffice // TODO: moggi: needs adaption for LibreOffice
// These paths need to be adapted for us. // These paths need to be adapted for us.
NS_tsnprintf(updateSettingsPath, int nWrittenBytes = NS_tsnprintf(updateSettingsPath,
sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]), sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]),
#ifdef MACOSX #ifdef MACOSX
NS_T("%s/Contents/Resources/update-settings.ini"), NS_T("%s/Contents/Resources/update-settings.ini"),
@@ -2680,6 +2682,7 @@ CheckSignature(ArchiveReader& archiveReader)
NS_T("%s/update-settings.ini"), NS_T("%s/update-settings.ini"),
#endif #endif
gWorkingDirPath); gWorkingDirPath);
(void) nWrittenBytes;
MARChannelStringTable MARStrings; MARChannelStringTable MARStrings;
if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK) if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK)
{ {
@@ -2743,8 +2746,9 @@ UpdateThreadFunc(void * /*param*/)
rv = DoUpdate(archiveReader); rv = DoUpdate(archiveReader);
} }
NS_tchar updatingDir[MAXPATHLEN]; NS_tchar updatingDir[MAXPATHLEN];
NS_tsnprintf(updatingDir, sizeof(updatingDir)/sizeof(updatingDir[0]), int nWrittenBytes = NS_tsnprintf(updatingDir, sizeof(updatingDir)/sizeof(updatingDir[0]),
NS_T("%s/updating"), gWorkingDirPath); NS_T("%s/updating"), gWorkingDirPath);
(void) nWrittenBytes;
ensure_remove_recursive(updatingDir); ensure_remove_recursive(updatingDir);
} }
} }
@@ -4452,8 +4456,9 @@ int AddPreCompleteActions(ActionList *list)
int DoUpdate(ArchiveReader& archiveReader) int DoUpdate(ArchiveReader& archiveReader)
{ {
NS_tchar manifest[MAXPATHLEN]; NS_tchar manifest[MAXPATHLEN];
NS_tsnprintf(manifest, sizeof(manifest)/sizeof(manifest[0]), int nWrittenBytes = NS_tsnprintf(manifest, sizeof(manifest)/sizeof(manifest[0]),
NS_T("%s/updating/update.manifest"), gWorkingDirPath); NS_T("%s/updating/update.manifest"), gWorkingDirPath);
(void) nWrittenBytes;
ensure_parent_dir(manifest); ensure_parent_dir(manifest);
// extract the manifest // extract the manifest