Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 12:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove some lint from pager.cpp

Browse source 
The primary pupose of this change is to make OpenSUSE builds happy by
adding a `DIE()` call so its build toolchain knows we won't fall off the
end of function `selection_direction_is_cardinal()`.
This commit is contained in:
Kurtis Rader 2017-02-15 15:21:35 -08:00
parent 06b2775131
commit ce61ada623
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/pager.cpp
View file

@ -55,12 +55,13 @@ inline bool selection_direction_is_cardinal(selection_direction_t dir) {
return false; return false;
} }
} }
DIE("should never reach this statement");
} }
/// Returns numer / denom, rounding up. As a "courtesy" 0/0 is 0. /// Returns numer / denom, rounding up. As a "courtesy" 0/0 is 0.
static size_t divide_round_up(size_t numer, size_t denom) { static size_t divide_round_up(size_t numer, size_t denom) {
if (numer == 0) return 0; if (numer == 0) return 0;
assert(denom > 0); assert(denom > 0);
bool has_rem = (numer % denom) != 0; bool has_rem = (numer % denom) != 0;
return numer / denom + (has_rem ? 1 : 0); return numer / denom + (has_rem ? 1 : 0);
@ -449,7 +450,6 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
print = true; print = true;
} else { } else {
// Compute total preferred width, plus spacing // Compute total preferred width, plus spacing
assert(cols > 0);
size_t total_width_needed = std::accumulate(width_by_column, width_by_column + cols, 0); size_t total_width_needed = std::accumulate(width_by_column, width_by_column + cols, 0);
total_width_needed += (cols - 1) * PAGER_SPACER_STRING_WIDTH; total_width_needed += (cols - 1) * PAGER_SPACER_STRING_WIDTH;
print = (total_width_needed <= term_width); print = (total_width_needed <= term_width);
@ -508,24 +508,24 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
print_max(progress_text, spec, term_width, true /* has_more */, &line); print_max(progress_text, spec, term_width, true /* has_more */, &line);
} }
if (search_field_shown) { if (!search_field_shown) {
// Add the search field. return true;
wcstring search_field_text = search_field_line.text;
// Append spaces to make it at least the required width.
if (search_field_text.size() < PAGER_SEARCH_FIELD_WIDTH) {
search_field_text.append(PAGER_SEARCH_FIELD_WIDTH - search_field_text.size(), L' ');
}
line_t *search_field = &rendering->screen_data.insert_line_at_index(0);
// We limit the width to term_width - 1.
size_t search_field_remaining = term_width - 1;
search_field_remaining -= print_max(SEARCH_FIELD_PROMPT, highlight_spec_normal,
search_field_remaining, false, search_field);
search_field_remaining -= print_max(search_field_text, highlight_modifier_force_underline,
search_field_remaining, false, search_field);
} }
// Add the search field.
wcstring search_field_text = search_field_line.text;
// Append spaces to make it at least the required width.
if (search_field_text.size() < PAGER_SEARCH_FIELD_WIDTH) {
search_field_text.append(PAGER_SEARCH_FIELD_WIDTH - search_field_text.size(), L' ');
}
line_t *search_field = &rendering->screen_data.insert_line_at_index(0);
// We limit the width to term_width - 1.
size_t search_field_remaining = term_width - 1;
search_field_remaining -= print_max(SEARCH_FIELD_PROMPT, highlight_spec_normal,
search_field_remaining, false, search_field);
search_field_remaining -= print_max(search_field_text, highlight_modifier_force_underline,
search_field_remaining, false, search_field);
return true; return true;
} }