github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-02 18:58:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify oclint error suppression for scoped_buffer_t

Browse Source
This commit is contained in:
Kurtis Rader 2016-07-20 22:43:48 -07:00
parent 1d2fff9686
commit 8140f74d75
2 changed files with 6 additions and 6 deletions

2
.oclint

@ -24,7 +24,7 @@ rule-configurations:
# RAII behavior so the local vars are actually used. # RAII behavior so the local vars are actually used.
# #
- key: RAII_CUSTOM_CLASSES - key: RAII_CUSTOM_CLASSES
value: scoped_lock value: scoped_lock scoped_buffer_t
disable-rules: disable-rules:
# #

10
src/screen.cpp

@ -472,7 +472,7 @@ static void s_move(screen_t *s, data_buffer_t *b, int new_x, int new_y) {
s->screen_cursor[0], s->screen_cursor[1], s->screen_cursor[0], s->screen_cursor[1],
new_x, new_y ); new_x, new_y );
*/ */
scoped_buffer_t scoped_buffer(b); //!OCLINT(has side effects) scoped_buffer_t scoped_buffer(b);
y_steps = new_y - s->actual.cursor.y; y_steps = new_y - s->actual.cursor.y;
@ -528,7 +528,7 @@ static void s_move(screen_t *s, data_buffer_t *b, int new_x, int new_y) {
/// Set the pen color for the terminal. /// Set the pen color for the terminal.
static void s_set_color(screen_t *s, data_buffer_t *b, highlight_spec_t c) { static void s_set_color(screen_t *s, data_buffer_t *b, highlight_spec_t c) {
scoped_buffer_t scoped_buffer(b); //!OCLINT(has side effects) scoped_buffer_t scoped_buffer(b);
unsigned int uc = (unsigned int)c; unsigned int uc = (unsigned int)c;
set_color(highlight_get_color(uc & 0xffff, false), set_color(highlight_get_color(uc & 0xffff, false),
@ -537,7 +537,7 @@ static void s_set_color(screen_t *s, data_buffer_t *b, highlight_spec_t c) {
/// Convert a wide character to a multibyte string and append it to the buffer. /// Convert a wide character to a multibyte string and append it to the buffer.
static void s_write_char(screen_t *s, data_buffer_t *b, wchar_t c) { static void s_write_char(screen_t *s, data_buffer_t *b, wchar_t c) {
scoped_buffer_t scoped_buffer(b); //!OCLINT(has side effects) scoped_buffer_t scoped_buffer(b);
s->actual.cursor.x += fish_wcwidth_min_0(c); s->actual.cursor.x += fish_wcwidth_min_0(c);
writech(c); writech(c);
if (s->actual.cursor.x == s->actual_width && allow_soft_wrap()) { if (s->actual.cursor.x == s->actual_width && allow_soft_wrap()) {
@ -554,13 +554,13 @@ static void s_write_char(screen_t *s, data_buffer_t *b, wchar_t c) {
/// Send the specified string through tputs and append the output to the specified buffer. /// Send the specified string through tputs and append the output to the specified buffer.
static void s_write_mbs(data_buffer_t *b, char *s) { static void s_write_mbs(data_buffer_t *b, char *s) {
scoped_buffer_t scoped_buffer(b); //!OCLINT(has side effects) scoped_buffer_t scoped_buffer(b);
writembs(s); writembs(s);
} }
/// Convert a wide string to a multibyte string and append it to the buffer. /// Convert a wide string to a multibyte string and append it to the buffer.
static void s_write_str(data_buffer_t *b, const wchar_t *s) { static void s_write_str(data_buffer_t *b, const wchar_t *s) {
scoped_buffer_t scoped_buffer(b); //!OCLINT(has side effects) scoped_buffer_t scoped_buffer(b);
writestr(s); writestr(s);
} }