Merge pull request #3179 from akallabeth/minor_fixes

Fix compiler warnings and FreeBSD compilation issue
This commit is contained in:
Martin Fleisz 2016-03-02 09:43:24 +01:00
commit cfe5923450
2 changed files with 1 additions and 3 deletions

View File

@ -150,7 +150,7 @@ BOOL CryptProtectMemory(LPVOID pData, DWORD cbData, DWORD dwFlags)
{
BYTE* pCipherText;
size_t cbOut, cbFinal;
WINPR_CIPHER_CTX* enc;
WINPR_CIPHER_CTX* enc = NULL;
BYTE randomKey[256];
WINPR_PROTECTED_MEMORY_BLOCK* pMemBlock;

View File

@ -1711,8 +1711,6 @@ DWORD GetTimeZoneInformation(LPTIME_ZONE_INFORMATION lpTimeZoneInformation)
#else
tz->Bias = 0;
#endif
WLog_DBG(TAG, "tzname[std]: %s, tzname[dst]: %s, timezone: %ld, Daylight: %d",
tzname[0], tzname[1], timezone, daylight);
dtz = winpr_detect_windows_time_zone(tz->Bias);