mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 23:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

charset: Silence PVS/V785: remove switch()

Browse Source 
No idea why it thinks that pre is constant expression, but switch() may be 
removed.
This commit is contained in:
ZyX
2018-04-09 10:14:45 +03:00
parent f8a44b73f0
commit 1edb4894dc
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/charset.c
View File

@@ -1731,7 +1731,7 @@ void vim_str2nr(const char_u *const start, int *const prep, int *const len,
&& !STRING_ENDED(ptr + 1) && !STRING_ENDED(ptr + 1)
&& ptr[0] == '0' && ptr[1] != '8' && ptr[1] != '9') { && ptr[0] == '0' && ptr[1] != '8' && ptr[1] != '9') {
pre = ptr[1]; pre = ptr[1];
// Detect hexadecimal: 0x or 0X follwed by hex digit // Detect hexadecimal: 0x or 0X followed by hex digit.
if ((what & STR2NR_HEX) if ((what & STR2NR_HEX)
&& !STRING_ENDED(ptr + 2) && !STRING_ENDED(ptr + 2)
&& (pre == 'X' || pre == 'x') && (pre == 'X' || pre == 'x')
@@ -1739,7 +1739,7 @@ void vim_str2nr(const char_u *const start, int *const prep, int *const len,
ptr += 2; ptr += 2;
goto vim_str2nr_hex; goto vim_str2nr_hex;
} }
// Detect binary: 0b or 0B follwed by 0 or 1 // Detect binary: 0b or 0B followed by 0 or 1.
if ((what & STR2NR_BIN) if ((what & STR2NR_BIN)
&& !STRING_ENDED(ptr + 2) && !STRING_ENDED(ptr + 2)
&& (pre == 'B' || pre == 'b') && (pre == 'B' || pre == 'b')
@@ -1747,7 +1747,7 @@ void vim_str2nr(const char_u *const start, int *const prep, int *const len,
ptr += 2; ptr += 2;
goto vim_str2nr_bin; goto vim_str2nr_bin;
} }
// Detect octal number: zero followed by octal digits without '8' or '9' // Detect octal number: zero followed by octal digits without '8' or '9'.
pre = 0; pre = 0;
if (!(what & STR2NR_OCT) if (!(what & STR2NR_OCT)
|| !('0' <= ptr[1] && ptr[1] <= '7')) { || !('0' <= ptr[1] && ptr[1] <= '7')) {
@@ -1778,32 +1778,21 @@ void vim_str2nr(const char_u *const start, int *const prep, int *const len,
ptr++; \ ptr++; \
} \ } \
} while (0) } while (0)
switch (pre) {
case 'b':
case 'B': {
vim_str2nr_bin: vim_str2nr_bin:
PARSE_NUMBER(2, (*ptr == '0' || *ptr == '1'), (*ptr - '0')); PARSE_NUMBER(2, (*ptr == '0' || *ptr == '1'), (*ptr - '0'));
break; goto vim_str2nr_proceed;
}
case '0': {
vim_str2nr_oct: vim_str2nr_oct:
PARSE_NUMBER(8, ('0' <= *ptr && *ptr <= '7'), (*ptr - '0')); PARSE_NUMBER(8, ('0' <= *ptr && *ptr <= '7'), (*ptr - '0'));
break; goto vim_str2nr_proceed;
}
case 0: {
vim_str2nr_dec: vim_str2nr_dec:
PARSE_NUMBER(10, (ascii_isdigit(*ptr)), (*ptr - '0')); PARSE_NUMBER(10, (ascii_isdigit(*ptr)), (*ptr - '0'));
break; goto vim_str2nr_proceed;
}
case 'x':
case 'X': {
vim_str2nr_hex: vim_str2nr_hex:
PARSE_NUMBER(16, (ascii_isxdigit(*ptr)), (hex2nr(*ptr))); PARSE_NUMBER(16, (ascii_isxdigit(*ptr)), (hex2nr(*ptr)));
break; goto vim_str2nr_proceed;
}
}
#undef PARSE_NUMBER #undef PARSE_NUMBER
vim_str2nr_proceed:
if (prep != NULL) { if (prep != NULL) {
*prep = pre; *prep = pre;
} }