diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-20 18:00:07 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-28 17:53:23 +0200 |
commit | c991d87ee2c239fedb77f76f25936dddf5eb5982 (patch) | |
tree | 60197b542b192670ba5bddcb24aa3c7754df99e4 /src/gui | |
parent | 449b347644a34ab37720874bf9f8bcffe2ea425e (diff) |
rhi: d3d11: Use qstrncpy to avoid MSVC warning
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 <christian.stromme@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/rhi/qrhid3d11.cpp | 6 |
1 files 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); } |