Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

eliminate warnings in auxiliary programs

Browse source 
Partially addresses issue #3430.
This commit is contained in:
Kurtis Rader 2016-10-09 14:43:25 -07:00
parent 37c4247cb7
commit a5034874ab
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fish_indent.cpp
View file

@ -84,7 +84,9 @@ static void dump_node(indent_t node_indent, const parse_node_t &node, const wcst
wcstring source_txt = L""; wcstring source_txt = L"";
if (node.source_start != SOURCE_OFFSET_INVALID && node.source_length != SOURCE_OFFSET_INVALID) { if (node.source_start != SOURCE_OFFSET_INVALID && node.source_length != SOURCE_OFFSET_INVALID) {
int nextc_idx = node.source_start + node.source_length; int nextc_idx = node.source_start + node.source_length;
if (nextc_idx < source.size()) nextc = source[node.source_start + node.source_length]; if ((size_t)nextc_idx < source.size()) {
nextc = source[node.source_start + node.source_length];
}
if (node.source_start > 0) prevc = source[node.source_start - 1]; if (node.source_start > 0) prevc = source[node.source_start - 1];
source_txt = source.substr(node.source_start, node.source_length); source_txt = source.substr(node.source_start, node.source_length);
} }

4
src/fish_key_reader.cpp
View file

@ -54,7 +54,7 @@ static bool should_exit(wchar_t wc) {
} }
/// Return the name if the recent sequence of characters matches a known terminfo sequence. /// Return the name if the recent sequence of characters matches a known terminfo sequence.
static char *const sequence_name(wchar_t wc) { static char *sequence_name(wchar_t wc) {
unsigned char c = wc < 0x80 ? wc : 0; unsigned char c = wc < 0x80 ? wc : 0;
static char recent_chars[8] = {0}; static char recent_chars[8] = {0};
@ -157,7 +157,7 @@ static void add_char_to_bind_command(wchar_t wc, std::vector<wchar_t> &bind_char
static void output_bind_command(std::vector<wchar_t> &bind_chars) { static void output_bind_command(std::vector<wchar_t> &bind_chars) {
if (bind_chars.size()) { if (bind_chars.size()) {
fputs("bind ", stdout); fputs("bind ", stdout);
for (int i = 0; i < bind_chars.size(); i++) { for (size_t i = 0; i < bind_chars.size(); i++) {
fputs(char_to_symbol(bind_chars[i], true), stdout); fputs(char_to_symbol(bind_chars[i], true), stdout);
} }
fputs(" 'do something'\n", stdout); fputs(" 'do something'\n", stdout);