griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove redundant checks in BLI_snprintf functions

Browse Source 
Checking for -1 only makes sense for signed types.
This commit is contained in:
Campbell Barton
2025-07-22 11:53:21 +10:00
parent 996210999b
commit c045ce324b
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenlib/intern/string.cc
View File

@@ -158,15 +158,12 @@ size_t BLI_vsnprintf(char *__restrict dst,
{
BLI_string_debug_size(dst, dst_maxncpy);
size_t n;
BLI_assert(dst != nullptr);
BLI_assert(dst_maxncpy > 0);
BLI_assert(format != nullptr);
n = size_t(vsnprintf(dst, dst_maxncpy, format, arg));
if (n != size_t(-1) && n < dst_maxncpy) {
const size_t n = size_t(vsnprintf(dst, dst_maxncpy, format, arg));
if (n < dst_maxncpy) {
dst[n] = '\0';
}
else {
@@ -183,15 +180,12 @@ size_t BLI_vsnprintf_rlen(char *__restrict dst,
{
BLI_string_debug_size(dst, dst_maxncpy);
size_t n;
BLI_assert(dst != nullptr);
BLI_assert(dst_maxncpy > 0);
BLI_assert(format != nullptr);
n = size_t(vsnprintf(dst, dst_maxncpy, format, arg));
if (n != size_t(-1) && n < dst_maxncpy) {
size_t n = size_t(vsnprintf(dst, dst_maxncpy, format, arg));
if (n < dst_maxncpy) {
/* pass */
}
else {