shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 08:26:52 +03:00
Code

terminal/page: drop unneeded DISABLE_WARNING_*

Browse Source 
The macros in shared/macro.h have been updated to no longer use fixed
variable names. This will silence any shadowing-warnings, so drop the
DISABLE_WARNING_* annotations.
This commit is contained in:
David Herrmann 2015-04-09 22:19:26 +02:00
parent 43ef760376
commit 7757517220
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd-terminal/term-page.c
View File

@ -798,11 +798,9 @@ static inline void line_insert(term_line *line, unsigned int from, unsigned int
age); age);
/* adjust fill-state */ /* adjust fill-state */
DISABLE_WARNING_SHADOW;
line->fill = MIN(line->width, line->fill = MIN(line->width,
MAX(line->fill + num, MAX(line->fill + num,
from + num)); from + num));
REENABLE_WARNING;
} else { } else {
/* modify head-cell */ /* modify head-cell */
term_cell_set(line->cells + from, term_cell_set(line->cells + from,
@ -871,11 +869,9 @@ void term_line_write(term_line *line, unsigned int pos_x, term_char_t ch, unsign
age); age);
/* adjust fill-state */ /* adjust fill-state */
DISABLE_WARNING_SHADOW;
line->fill = MIN(line->width, line->fill = MIN(line->width,
MAX(line->fill, MAX(line->fill,
pos_x + len)); pos_x + len));
REENABLE_WARNING;
} }
} }