diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-06-15 12:39:44 +0300 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 09:10:39 -0500 |
| commit | aadf1b51bb8f489b8aa3fb9e6cc5290ee0164bd2 (patch) | |
| tree | 3485c70cb36b5f0d057d0d36771a76ed3a00909a /vcl | |
| parent | c16789673f887e9638a90a1b74d678b0edbef6b9 (diff) | |
Fix humorous search/replace accident
Change-Id: Iaef623fd52bab9bf296431f1b905afb04e16d05b
(cherry picked from commit 7eac94da23f2f4460252eae5fa073fd1d833ba99)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index b72751acbc62..8659c9b3c2c6 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -797,12 +797,13 @@ void WinOpenGLDeviceInfo::GetData() deviceIndex++; } - // make sure the string is nullptr terminated + // make sure the string is null terminated + // (using the term "null" here to mean a zero UTF-16 unit) if (wcsnlen(displayDevice.DeviceKey, ArrayLength(displayDevice.DeviceKey)) == ArrayLength(displayDevice.DeviceKey)) { - // we did not find a nullptr - SAL_WARN("vcl.opengl", "no null pointer"); + // we did not find a null + SAL_WARN("vcl.opengl", "string not null terminated"); return; } |