Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warnings about array subscript in builtin_printf.cpp

Browse source
This commit is contained in:
ridiculousfish 2013-07-16 13:38:15 -07:00
parent 28fdfec7cb
commit c522c0833a
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
builtin_printf.cpp
View file

@ -581,6 +581,16 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc
} }
} }
/* For each character in str, set the corresponding boolean in the array to the given flag */
static inline void modify_allowed_format_specifiers(bool ok[UCHAR_MAX + 1], const char *str, bool flag)
{
for (const char *c = str; *c != '\0'; c++)
{
unsigned char idx = static_cast<unsigned char>(*c);
ok[idx] = flag;
}
}
/* Print the text in FORMAT, using ARGV (with ARGC elements) for /* Print the text in FORMAT, using ARGV (with ARGC elements) for
arguments to any `%' directives. arguments to any `%' directives.
Return the number of elements of ARGV used. */ Return the number of elements of ARGV used. */
@ -622,10 +632,8 @@ int builtin_printf_state_t::print_formatted(const wchar_t *format, int argc, wch
} }
break; break;
} }
ok['a'] = ok['A'] = ok['c'] = ok['d'] = ok['e'] = ok['E'] = modify_allowed_format_specifiers(ok, "aAcdeEfFgGiosuxX", true);
ok['f'] = ok['F'] = ok['g'] = ok['G'] = ok['i'] = ok['o'] =
ok['s'] = ok['u'] = ok['x'] = ok['X'] = true;
for (;; f++, direc_length++) for (;; f++, direc_length++)
{ {
@ -633,18 +641,17 @@ int builtin_printf_state_t::print_formatted(const wchar_t *format, int argc, wch
{ {
case L'I': case L'I':
case L'\'': case L'\'':
ok['a'] = ok['A'] = ok['c'] = ok['e'] = ok['E'] = modify_allowed_format_specifiers(ok, "aAceEosxX", false);
ok['o'] = ok['s'] = ok['x'] = ok['X'] = false;
break; break;
case '-': case '-':
case '+': case '+':
case ' ': case ' ':
break; break;
case L'#': case L'#':
ok['c'] = ok['d'] = ok['i'] = ok['s'] = ok['u'] = false; modify_allowed_format_specifiers(ok, "cdisu", false);
break; break;
case '0': case '0':
ok['c'] = ok['s'] = false; modify_allowed_format_specifiers(ok, "cs", false);
break; break;
default: default:
goto no_more_flag_characters; goto no_more_flag_characters;
@ -685,7 +692,7 @@ no_more_flag_characters:
{ {
++f; ++f;
++direc_length; ++direc_length;
ok['c'] = false; modify_allowed_format_specifiers(ok, "c", false);
if (*f == L'*') if (*f == L'*')
{ {
++f; ++f;