Changeset bbe7848 in mainline for uspace/app/edit/edit.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• uspace/app/edit/edit.c (modified) (3 diffs)

uspace/app/edit/edit.c

@@ -781 +781 @@
                         c = str_decode(row_buf, &pos, size);
                         if (c != '\t') {
-                                printf("%lc", c);
+                                printf("%lc", (wint_t) c);
                                 s_column += 1;
                         } else {
@@ -830 +830 @@
         int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
             "Ctrl-E Save As", coord.row, coord.column, fname);
-        printf("%*s", scr_columns - 1 - n, "");
+        
+        int pos = scr_columns - 1 - n;
+        printf("%*s", pos, "");
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);
@@ -1153 +1155 @@
         console_set_pos(con, 0, scr_rows - 1);
         console_set_style(con, STYLE_INVERTED);
-        printf(" %*s ", -(scr_columns - 3), str);
+        
+        int pos = -(scr_columns - 3);
+        printf(" %*s ", pos, str);
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);