]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
terminal/page: drop unneeded DISABLE_WARNING_*
authorDavid Herrmann <dh.herrmann@gmail.com>
Thu, 9 Apr 2015 20:19:26 +0000 (22:19 +0200)
committerDavid Herrmann <dh.herrmann@gmail.com>
Thu, 9 Apr 2015 20:59:59 +0000 (22:59 +0200)
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.

src/libsystemd-terminal/term-page.c

index cbd80067347a536eadfc3c84f7d81530ebc39f39..bac85200f131016931c5172b4d6a78e5f56dcba3 100644 (file)
@@ -798,11 +798,9 @@ static inline void line_insert(term_line *line, unsigned int from, unsigned int
                                  age);
 
                 /* adjust fill-state */
-                DISABLE_WARNING_SHADOW;
                 line->fill = MIN(line->width,
                                  MAX(line->fill + num,
                                      from + num));
-                REENABLE_WARNING;
         } else {
                 /* modify head-cell */
                 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);
 
                 /* adjust fill-state */
-                DISABLE_WARNING_SHADOW;
                 line->fill = MIN(line->width,
                                  MAX(line->fill,
                                      pos_x + len));
-                REENABLE_WARNING;
         }
 }