IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

PVS/V1028 (rework): cast operands, not the result #9531

Browse Source 
closes #9522
This commit is contained in:
Justin M. Keyes 2019-01-21 23:49:58 +01:00 committed by GitHub
parent 4cea88aa37
commit bfb8170d32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/assert.h
View File

@ -145,7 +145,7 @@
} while (0)
#else
# define STRICT_ADD(a, b, c, t) \
do { *(c) = (t)(a + b); } while (0)
do { *(c) = (t)((a) + (b)); } while (0)
#endif
/// @def STRICT_SUB
@ -160,7 +160,7 @@
} while (0)
#else
# define STRICT_SUB(a, b, c, t) \
do { *(c) = (t)(a - b); } while (0)
do { *(c) = (t)((a) - (b)); } while (0)
#endif
#endif // NVIM_ASSERT_H

13
src/nvim/indent.c
View File

@ -204,13 +204,12 @@ int set_indent(int size, int flags)
// characters and allocate accordingly. We will fill the rest with spaces
// after the if (!curbuf->b_p_et) below.
if (orig_char_len != -1) {
assert(orig_char_len + size - ind_done + line_len >= 0);
size_t n; // = orig_char_len + size - ind_done + line_len
size_t n2;
STRICT_ADD(orig_char_len, size, &n, size_t);
STRICT_ADD(ind_done, line_len, &n2, size_t);
STRICT_SUB(n, n2, &n, size_t);
newline = xmalloc(n);
int newline_size; // = orig_char_len + size - ind_done + line_len
STRICT_ADD(orig_char_len, size, &newline_size, int);
STRICT_SUB(newline_size, ind_done, &newline_size, int);
STRICT_ADD(newline_size, line_len, &newline_size, int);
assert(newline_size >= 0);
newline = xmalloc((size_t)newline_size);
todo = size - ind_done;
// Set total length of indent in characters, which may have been