strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cid#1557682 alt fix for Initialization or destruction ordering is unspecified

Browse source 
Change-Id: Ibbcc3808a7a7ec71a046b263757506f61ac48093
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174970
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-10-14 13:13:00 +01:00
parent 5702619540
commit 28d8a59d9c
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sal/osl/all/log.cxx
View file

@ -55,16 +55,14 @@ bool const sal_use_syslog = false;
namespace {
struct TimeContainer
TimeValue GetTime()
{
TimeValue aTime;
TimeContainer()
{
osl_getSystemTime(&aTime);
}
};
osl_getSystemTime(&aTime);
return aTime;
}
TimeContainer aStartTime;
const TimeValue aStartTime = GetTime();
bool equalStrings(
char const * string1, std::size_t length1, char const * string2,
@ -276,26 +274,21 @@ void maybeOutputTimestamp(std::ostringstream &s) {
s << ts << '.' << milliSecs << ':';
}
// disable this fairly obscure feature when building with coverity
// to avoid a bazillion 'Initialization or destruction ordering is unspecified'
// warnings about the use of aStartTime
#if !defined(__COVERITY__) || __COVERITY_MAJOR__ > 2023
if (outputRelativeTimer)
{
int seconds = now.Seconds - aStartTime.aTime.Seconds;
int seconds = now.Seconds - aStartTime.Seconds;
int milliSeconds;
if (now.Nanosec < aStartTime.aTime.Nanosec)
if (now.Nanosec < aStartTime.Nanosec)
{
seconds--;
milliSeconds = 1000 - (aStartTime.aTime.Nanosec - now.Nanosec) / 1000000;
milliSeconds = 1000 - (aStartTime.Nanosec - now.Nanosec) / 1000000;
}
else
milliSeconds = (now.Nanosec - aStartTime.aTime.Nanosec) / 1000000;
milliSeconds = (now.Nanosec - aStartTime.Nanosec) / 1000000;
char relativeTimestamp[100];
snprintf(relativeTimestamp, sizeof(relativeTimestamp), "%d.%03d", seconds, milliSeconds);
s << relativeTimestamp << ':';
}
#endif
}
#endif