From c991d87ee2c239fedb77f76f25936dddf5eb5982 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 20 May 2020 18:00:07 +0200 Subject: [PATCH] rhi: d3d11: Use qstrncpy to avoid MSVC warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch strncpy to qstrncpy, which internally uses strncpy_s with MSVC. This way we will not get the following warning: qrhid3d11.cpp(933): warning C4996: 'strncpy': This function or variable may be unsafe. Consider using strncpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. Change-Id: Iaed86033b0fc182e68804f311ac382c93c72abda Reviewed-by: Christian Strømme --- src/gui/rhi/qrhid3d11.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp index c956576096..726da3df86 100644 --- a/src/gui/rhi/qrhid3d11.cpp +++ b/src/gui/rhi/qrhid3d11.cpp @@ -932,8 +932,7 @@ void QRhiD3D11::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name) QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb); QD3D11CommandBuffer::Command cmd; cmd.cmd = QD3D11CommandBuffer::Command::DebugMarkBegin; - strncpy(cmd.args.debugMark.s, name.constData(), sizeof(cmd.args.debugMark.s)); - cmd.args.debugMark.s[sizeof(cmd.args.debugMark.s) - 1] = '\0'; + qstrncpy(cmd.args.debugMark.s, name.constData(), sizeof(cmd.args.debugMark.s)); cbD->commands.append(cmd); } @@ -956,8 +955,7 @@ void QRhiD3D11::debugMarkMsg(QRhiCommandBuffer *cb, const QByteArray &msg) QD3D11CommandBuffer *cbD = QRHI_RES(QD3D11CommandBuffer, cb); QD3D11CommandBuffer::Command cmd; cmd.cmd = QD3D11CommandBuffer::Command::DebugMarkMsg; - strncpy(cmd.args.debugMark.s, msg.constData(), sizeof(cmd.args.debugMark.s)); - cmd.args.debugMark.s[sizeof(cmd.args.debugMark.s) - 1] = '\0'; + qstrncpy(cmd.args.debugMark.s, msg.constData(), sizeof(cmd.args.debugMark.s)); cbD->commands.append(cmd); }