vcl/opengl/win/WinDeviceInfo.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
New commits: commit 7eac94da23f2f4460252eae5fa073fd1d833ba99 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 15 12:39:44 2015 +0300 Fix humorous search/replace accident Change-Id: Iaef623fd52bab9bf296431f1b905afb04e16d05b diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 151476d..abc367a 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -766,12 +766,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; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
